The patch titled Subject: mmhwpoison-drop-unneeded-pcplist-draining-fix has been added to the -mm tree. Its filename is mmhwpoison-drop-unneeded-pcplist-draining-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mmhwpoison-drop-unneeded-pcplist-draining-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mmhwpoison-drop-unneeded-pcplist-draining-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mmhwpoison-drop-unneeded-pcplist-draining-fix remove unused local `zone', reflow block comment Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/madvise.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/mm/madvise.c~mmhwpoison-drop-unneeded-pcplist-draining-fix +++ a/mm/madvise.c @@ -869,7 +869,6 @@ static long madvise_remove(struct vm_are static int madvise_inject_error(int behavior, unsigned long start, unsigned long end) { - struct zone *zone; unsigned long size; if (!capable(CAP_SYS_ADMIN)) @@ -901,9 +900,10 @@ static int madvise_inject_error(int beha pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n", pfn, start); /* - * Drop the page reference taken by get_user_pages_fast(). In - * the absence of MF_COUNT_INCREASED the memory_failure() - * routine is responsible for pinning the page to prevent it + * Drop the page reference taken by + * get_user_pages_fast(). In the absence of + * MF_COUNT_INCREASED the memory_failure() routine is + * responsible for pinning the page to prevent it * from being released back to the page allocator. */ put_page(page); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-slub-re-initialize-randomized-freelist-sequence-in-calculate_sizes-fix.patch mm.patch mm-memory_hotplug-introduce-default-phys_to_target_node-implementation-fix.patch device-dax-make-align-a-per-device-property-fix.patch powerpc-mm-move-setting-pte-specific-flags-to-pfn_pte-fix.patch mm-gup-dont-permit-users-to-call-get_user_pages-with-foll_longterm-fix.patch memblock-make-memblock_debug-and-related-functionality-private-fix.patch arch-drivers-replace-for_each_membock-with-for_each_mem_range-fix.patch xarray-add-xa_get_order-fix.patch xarray-add-xas_split-fix.patch mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix.patch mmhwpoison-drop-unneeded-pcplist-draining-fix.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch fs-binfmt_elf-use-pt_load-p_align-values-for-suitable-start-address-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch