[folded-merged] mm-memblock-hardcode-the-end_pfn-being-1-fix.patch removed from -mm tree

[folded-merged] mm-memblock-hardcode-the-end_pfn-being-1-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-memblock-hardcode-the-end_pfn-being-1-fix
has been removed from the -mm tree.  Its filename was
     mm-memblock-hardcode-the-end_pfn-being-1-fix.patch

This patch was dropped because it was folded into mm-memblock-hardcode-the-end_pfn-being-1.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memblock-hardcode-the-end_pfn-being-1-fix

make it work against current -linus, not against -mm

Cc: Daniel Vacek <neelx@redhat.com>
Cc: <stable@vger.kernel.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_alloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/page_alloc.c~mm-memblock-hardcode-the-end_pfn-being-1-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-memblock-hardcode-the-end_pfn-being-1-fix
+++ a/mm/page_alloc.c
@@ -5361,7 +5361,7 @@ void __meminit memmap_init_zone(unsigned
 			 * end_pfn), such that we hit a valid pfn (or end_pfn)
 			 * on our next iteration of the loop.
 			 */
-			pfn = memblock_next_valid_pfn(pfn) - 1;
+			pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
 #endif
 			continue;
 		}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-memblock-hardcode-the-end_pfn-being-1.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch

Re: [folded-merged] mm-memblock-hardcode-the-end_pfn-being-1-fix.patch removed from -mm tree

[Daniel Vacek]

Hi Andrew,

On Sat, Mar 10, 2018 at 12:45 AM,  <akpm@linux-foundation.org> wrote:
>
> The patch titled
>      Subject: mm-memblock-hardcode-the-end_pfn-being-1-fix
> has been removed from the -mm tree.  Its filename was
>      mm-memblock-hardcode-the-end_pfn-being-1-fix.patch
>
> This patch was dropped because it was folded into mm-memblock-hardcode-the-end_pfn-being-1.patch
>
> ------------------------------------------------------
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: mm-memblock-hardcode-the-end_pfn-being-1-fix
>
> make it work against current -linus, not against -mm

What I've originally sent was already diff against -linus. There
should be no need for any fix.

> -                       pfn = memblock_next_valid_pfn(pfn) - 1;
> +                       pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;

The end_pfn should be gone. That's actually the reason for this patch.

--nX