The patch titled Subject: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix has been removed from the -mm tree. Its filename was lib-show_mem-this-patch-adds-cma-reserved-infromation-fix.patch This patch was dropped because it was folded into lib-show_mem-this-patch-adds-cma-reserved-infromation.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix remove hopefully-unneeded ifdefs Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Pintu Kumar <pintu.k@xxxxxxxxxxx> Cc: Vishnu Pratap Singh <vishnu.ps@xxxxxxxxxxx> Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/show_mem.c | 2 -- 1 file changed, 2 deletions(-) diff -puN lib/show_mem.c~lib-show_mem-this-patch-adds-cma-reserved-infromation-fix lib/show_mem.c --- a/lib/show_mem.c~lib-show_mem-this-patch-adds-cma-reserved-infromation-fix +++ a/lib/show_mem.c @@ -8,9 +8,7 @@ #include <linux/mm.h> #include <linux/nmi.h> #include <linux/quicklist.h> -#ifdef CONFIG_CMA #include <linux/cma.h> -#endif void show_mem(unsigned int filter) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch lib-show_mem-this-patch-adds-cma-reserved-infromation.patch input-route-kbd-leds-through-the-generic-leds-layer.patch o2dlm-fix-null-pointer-dereference-in-o2dlm_blocking_ast_wrapper.patch ocfs2-free-inode-when-i_count-becomes-zero.patch ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir.patch mm.patch mm-replace-remap_file_pages-syscall-with-emulation.patch mm-page_allocc-__alloc_pages_nodemask-dont-alter-arg-gfp_mask.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch sysctl-terminate-strings-also-on-r-fix.patch linux-next.patch linux-next-git-rejects.patch drivers-gpio-gpio-zevioc-fix-build.patch tools-testing-selftests-makefile-alphasort-the-targets-list.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.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