The patch titled Subject: mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix has been removed from the -mm tree. Its filename was mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix.patch This patch was dropped because it was folded into mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix Propagate mm-fix-incorrect-nr_free_pages-accounting-appears-like-memory-leak.patch through mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page.patch Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Dave Hansen <dave@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/page_alloc.c~mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix +++ a/mm/page_alloc.c @@ -1401,7 +1401,7 @@ int capture_free_page(struct page *page, if (!zone_watermark_ok(zone, 0, watermark, 0, 0)) return 0; - __mod_zone_freepage_state(zone, -(1UL << order), mt); + __mod_zone_freepage_state(zone, -(1UL << alloc_order), mt); } /* Remove page from free list */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-introduce-mm_find_pmd.patch memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch slub-hotplug-ignore-unrelated-nodes-hot-adding-and-hot-removing.patch mmvmscan-only-evict-file-pages-when-we-have-plenty.patch dmapool-make-dmapool_debug-detect-corruption-of-free-marker.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7.patch mm-check-rb_subtree_gap-correctness.patch mm-rearrange-vm_area_struct-for-fewer-cache-misses.patch mm-vm_unmapped_area-lookup-function.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-i386-architecture.patch mm-use-vm_unmapped_area-on-mips-architecture.patch mm-use-vm_unmapped_area-on-arm-architecture.patch mm-use-vm_unmapped_area-on-sh-architecture.patch mm-use-vm_unmapped_area-on-sparc32-architecture.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-tile-architecture.patch mm-use-vm_unmapped_area-on-sparc64-architecture.patch arch-sparc-kernel-sys_sparc_64c-s-colour-color.patch mm-introduce-a-common-interface-for-balloon-pages-mobility.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages.patch mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page.patch bootmem-fix-wrong-call-parameter-for-free_bootmem-fix.patch mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html