[PATCH OLK-6.6 06/19] mm: page_alloc: fix up block types when merging compatible blocks