diff for duplicates of <1474924351.2857.255.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 0545b50..92fd3a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,3 +45,9 @@ Ben. > > if (parse_numa_properties()) > > setup_nonnuma(); > > else + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index e146092..feb44ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -69,6 +69,12 @@ "> +\n" "> > \302\240\tif (parse_numa_properties())\n" "> > \302\240\t\tsetup_nonnuma();\n" - "> > \302\240\telse" + "> > \302\240\telse\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -f1a46d286fb4e8b80727642b488b4ecb229286f91f88929c7dd9288c7636e65d +55ac362e26154172c6e6b4ebb2c452ce95b7ebd949d5f457558e6e93a2643bc8
diff --git a/a/1.txt b/N2/1.txt index 0545b50..451079c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,20 +28,26 @@ Ben. > Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> > --- -> arch/powerpc/mm/numa.c | 3 +++ -> 1 file changed, 3 insertions(+) +> A arch/powerpc/mm/numa.c | 3 +++ +> A 1 file changed, 3 insertions(+) > > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index d7ac419..fdf1e69 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -945,6 +945,9 @@ void __init initmem_init(void) -> > max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT; -> > max_pfn = max_low_pfn; -> +> > A max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT; +> > A max_pfn = max_low_pfn; +> A > > + /* bottom-up allocation may have been set by movable_node */ > > + memblock_set_bottom_up(false); > + -> > if (parse_numa_properties()) -> > setup_nonnuma(); -> > else +> > A if (parse_numa_properties()) +> > A setup_nonnuma(); +> > A else + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index e146092..47b8e5e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -53,22 +53,28 @@ "\n" "> Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com>\n" "> ---\n" - "> \302\240arch/powerpc/mm/numa.c | 3 +++\n" - "> \302\2401 file changed, 3 insertions(+)\n" + "> A arch/powerpc/mm/numa.c | 3 +++\n" + "> A 1 file changed, 3 insertions(+)\n" "> \n" "> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c\n" "> index d7ac419..fdf1e69 100644\n" "> --- a/arch/powerpc/mm/numa.c\n" "> +++ b/arch/powerpc/mm/numa.c\n" "> @@ -945,6 +945,9 @@ void __init initmem_init(void)\n" - "> > \302\240\tmax_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;\n" - "> > \302\240\tmax_pfn = max_low_pfn;\n" - "> \302\240\n" + "> > A \tmax_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;\n" + "> > A \tmax_pfn = max_low_pfn;\n" + "> A \n" "> > +\t/* bottom-up allocation may have been set by movable_node */\n" "> > +\tmemblock_set_bottom_up(false);\n" "> +\n" - "> > \302\240\tif (parse_numa_properties())\n" - "> > \302\240\t\tsetup_nonnuma();\n" - "> > \302\240\telse" + "> > A \tif (parse_numa_properties())\n" + "> > A \t\tsetup_nonnuma();\n" + "> > A \telse\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -f1a46d286fb4e8b80727642b488b4ecb229286f91f88929c7dd9288c7636e65d +272c7a88a50a6eaed78005170c990c383bb3ed1e1f237b74a10ed02d755353ba
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.