Subject: [folded-merged] mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,aarcange@xxxxxxxxxx,dave.hansen@xxxxxxxxxxxxxxx,dhillf@xxxxxxxxx,mgorman@xxxxxxx,n-horiguchi@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 21 Nov 2013 14:29:11 -0800 The patch titled Subject: mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix has been removed from the -mm tree. Its filename was mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix.patch This patch was dropped because it was folded into mm-thp-give-transparent-hugepage-code-a-separate-copy_page.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix fix coding-style and comment text, per Naoya Horiguchi Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Hillf Danton <dhillf@xxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/migrate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN mm/migrate.c~mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix mm/migrate.c --- a/mm/migrate.c~mm-thp-give-transparent-hugepage-code-a-separate-copy_page-fix +++ a/mm/migrate.c @@ -442,9 +442,9 @@ int migrate_huge_page_move_mapping(struc } /* - * Gigantic pages are so large that the we do not guarantee - * that page++ pointer arithmetic will work across the - * entire page. We need something more specialized. + * Gigantic pages are so large that we do not guarantee that page++ pointer + * arithmetic will work across the entire page. We need something more + * specialized. */ static void __copy_gigantic_page(struct page *dst, struct page *src, int nr_pages) @@ -483,7 +483,7 @@ static void copy_huge_page(struct page * nr_pages = hpage_nr_pages(src); } - for (i = 0; i < nr_pages; i++ ) { + for (i = 0; i < nr_pages; i++) { cond_resched(); copy_highpage(dst + i, src + i); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch mm-thp-give-transparent-hugepage-code-a-separate-copy_page.patch kernel-time-tick-commonc-document-tick_do_timer_cpu.patch drivers-block-ccissc-cciss_init_one-use-proper-errnos.patch block-blk-mq-cpuc-use-hotcpu_notifier.patch posix_acl-uninlining.patch mm.patch mm-hugetlbc-simplify-pageheadhuge-and-pagehuge.patch mm-swapc-reorganize-put_compound_page.patch mm-get-rid-of-unnecessary-pageblock-scanning-in-setup_zone_migrate_reserve-fix.patch lib-parserc-put-export_symbols-in-the-conventional-place.patch kernel-paramsc-improve-standard-definitions-checkpatch-fixes.patch kmod-run-usermodehelpers-only-on-cpus-allowed-for-kthreadd-v2-fix.patch kmod-run-usermodehelpers-only-on-cpus-allowed-for-kthreadd-v2-checkpatch-fixes.patch linux-next.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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