diff for duplicates of <506E46F7.4080006@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 86b58dc..0bdc107 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,8 +27,7 @@ Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> 8 files changed, 113 insertions(+), 14 deletions(-) Index: linux-3.6/include/linux/memory_hotplug.h -=================================================================== ---- linux-3.6.orig/include/linux/memory_hotplug.h 2012-10-04 17:15:03.029828127 +0900 +=================================--- linux-3.6.orig/include/linux/memory_hotplug.h 2012-10-04 17:15:03.029828127 +0900 +++ linux-3.6/include/linux/memory_hotplug.h 2012-10-04 17:15:59.010833688 +0900 @@ -163,17 +163,10 @@ static inline void arch_refresh_nodedata #endif /* CONFIG_NUMA */ @@ -51,8 +50,7 @@ Index: linux-3.6/include/linux/memory_hotplug.h /* * Lock for memory hotplug guarantees 1) all callbacks for memory hotplug Index: linux-3.6/mm/memory_hotplug.c -=================================================================== ---- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 17:15:27.213831361 +0900 +=================================--- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 17:15:27.213831361 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 17:37:00.176401540 +0900 @@ -91,9 +91,8 @@ static void release_memory_resource(stru } @@ -120,8 +118,7 @@ Index: linux-3.6/mm/memory_hotplug.c static void grow_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) Index: linux-3.6/arch/ia64/mm/discontig.c -=================================================================== ---- linux-3.6.orig/arch/ia64/mm/discontig.c 2012-10-01 08:47:46.000000000 +0900 +=================================--- linux-3.6.orig/arch/ia64/mm/discontig.c 2012-10-01 08:47:46.000000000 +0900 +++ linux-3.6/arch/ia64/mm/discontig.c 2012-10-04 17:15:59.209833459 +0900 @@ -822,4 +822,10 @@ int __meminit vmemmap_populate(struct pa { @@ -135,8 +132,7 @@ Index: linux-3.6/arch/ia64/mm/discontig.c +} #endif Index: linux-3.6/arch/powerpc/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/powerpc/mm/init_64.c 2012-10-01 08:47:46.000000000 +0900 +=================================--- linux-3.6.orig/arch/powerpc/mm/init_64.c 2012-10-01 08:47:46.000000000 +0900 +++ linux-3.6/arch/powerpc/mm/init_64.c 2012-10-04 17:15:59.217833663 +0900 @@ -298,5 +298,11 @@ int __meminit vmemmap_populate(struct pa @@ -151,8 +147,7 @@ Index: linux-3.6/arch/powerpc/mm/init_64.c #endif /* CONFIG_SPARSEMEM_VMEMMAP */ Index: linux-3.6/arch/s390/mm/vmem.c -=================================================================== ---- linux-3.6.orig/arch/s390/mm/vmem.c 2012-10-01 08:47:46.000000000 +0900 +=================================--- linux-3.6.orig/arch/s390/mm/vmem.c 2012-10-01 08:47:46.000000000 +0900 +++ linux-3.6/arch/s390/mm/vmem.c 2012-10-04 17:15:59.227833764 +0900 @@ -227,6 +227,12 @@ out: return ret; @@ -168,8 +163,7 @@ Index: linux-3.6/arch/s390/mm/vmem.c * Add memory segment to the segment list if it doesn't overlap with * an already present segment. Index: linux-3.6/arch/sparc/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/sparc/mm/init_64.c 2012-10-01 08:47:46.000000000 +0900 +=================================--- linux-3.6.orig/arch/sparc/mm/init_64.c 2012-10-01 08:47:46.000000000 +0900 +++ linux-3.6/arch/sparc/mm/init_64.c 2012-10-04 17:15:59.232833747 +0900 @@ -2077,6 +2077,12 @@ void __meminit vmemmap_populate_print_la node_start = 0; @@ -185,8 +179,7 @@ Index: linux-3.6/arch/sparc/mm/init_64.c static void prot_init_common(unsigned long page_none, Index: linux-3.6/arch/x86/mm/init_64.c -=================================================================== ---- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 17:15:03.021828121 +0900 +=================================--- linux-3.6.orig/arch/x86/mm/init_64.c 2012-10-04 17:15:03.021828121 +0900 +++ linux-3.6/arch/x86/mm/init_64.c 2012-10-04 17:15:59.240833769 +0900 @@ -993,6 +993,58 @@ vmemmap_populate(struct page *start_page return 0; @@ -248,8 +241,7 @@ Index: linux-3.6/arch/x86/mm/init_64.c { if (p_start) { Index: linux-3.6/include/linux/mm.h -=================================================================== ---- linux-3.6.orig/include/linux/mm.h 2012-10-01 08:47:46.000000000 +0900 +=================================--- linux-3.6.orig/include/linux/mm.h 2012-10-01 08:47:46.000000000 +0900 +++ linux-3.6/include/linux/mm.h 2012-10-04 17:15:59.246833767 +0900 @@ -1618,7 +1618,8 @@ int vmemmap_populate_basepages(struct pa unsigned long pages, int node); @@ -261,9 +253,3 @@ Index: linux-3.6/include/linux/mm.h enum mf_flags { MF_COUNT_INCREASED = 1 << 0, - --- -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 7bb6ad8..bd0d3c1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0506E43E0.70507@jp.fujitsu.com\0" "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 6/10] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap\0" - "Date\0Fri, 5 Oct 2012 11:33:27 +0900\0" + "Date\0Fri, 05 Oct 2012 02:33:27 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -52,8 +52,7 @@ " 8 files changed, 113 insertions(+), 14 deletions(-)\n" "\n" "Index: linux-3.6/include/linux/memory_hotplug.h\n" - "===================================================================\n" - "--- linux-3.6.orig/include/linux/memory_hotplug.h\t2012-10-04 17:15:03.029828127 +0900\n" + "=================================--- linux-3.6.orig/include/linux/memory_hotplug.h\t2012-10-04 17:15:03.029828127 +0900\n" "+++ linux-3.6/include/linux/memory_hotplug.h\t2012-10-04 17:15:59.010833688 +0900\n" "@@ -163,17 +163,10 @@ static inline void arch_refresh_nodedata\n" " #endif /* CONFIG_NUMA */\n" @@ -76,8 +75,7 @@ " /*\n" " * Lock for memory hotplug guarantees 1) all callbacks for memory hotplug\n" "Index: linux-3.6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 17:15:27.213831361 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 17:15:27.213831361 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 17:37:00.176401540 +0900\n" "@@ -91,9 +91,8 @@ static void release_memory_resource(stru\n" " }\n" @@ -145,8 +143,7 @@ " static void grow_zone_span(struct zone *zone, unsigned long start_pfn,\n" " \t\t\t unsigned long end_pfn)\n" "Index: linux-3.6/arch/ia64/mm/discontig.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/ia64/mm/discontig.c\t2012-10-01 08:47:46.000000000 +0900\n" + "=================================--- linux-3.6.orig/arch/ia64/mm/discontig.c\t2012-10-01 08:47:46.000000000 +0900\n" "+++ linux-3.6/arch/ia64/mm/discontig.c\t2012-10-04 17:15:59.209833459 +0900\n" "@@ -822,4 +822,10 @@ int __meminit vmemmap_populate(struct pa\n" " {\n" @@ -160,8 +157,7 @@ "+}\n" " #endif\n" "Index: linux-3.6/arch/powerpc/mm/init_64.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/powerpc/mm/init_64.c\t2012-10-01 08:47:46.000000000 +0900\n" + "=================================--- linux-3.6.orig/arch/powerpc/mm/init_64.c\t2012-10-01 08:47:46.000000000 +0900\n" "+++ linux-3.6/arch/powerpc/mm/init_64.c\t2012-10-04 17:15:59.217833663 +0900\n" "@@ -298,5 +298,11 @@ int __meminit vmemmap_populate(struct pa\n" " \n" @@ -176,8 +172,7 @@ " #endif /* CONFIG_SPARSEMEM_VMEMMAP */\n" " \n" "Index: linux-3.6/arch/s390/mm/vmem.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/s390/mm/vmem.c\t2012-10-01 08:47:46.000000000 +0900\n" + "=================================--- linux-3.6.orig/arch/s390/mm/vmem.c\t2012-10-01 08:47:46.000000000 +0900\n" "+++ linux-3.6/arch/s390/mm/vmem.c\t2012-10-04 17:15:59.227833764 +0900\n" "@@ -227,6 +227,12 @@ out:\n" " \treturn ret;\n" @@ -193,8 +188,7 @@ " * Add memory segment to the segment list if it doesn't overlap with\n" " * an already present segment.\n" "Index: linux-3.6/arch/sparc/mm/init_64.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/sparc/mm/init_64.c\t2012-10-01 08:47:46.000000000 +0900\n" + "=================================--- linux-3.6.orig/arch/sparc/mm/init_64.c\t2012-10-01 08:47:46.000000000 +0900\n" "+++ linux-3.6/arch/sparc/mm/init_64.c\t2012-10-04 17:15:59.232833747 +0900\n" "@@ -2077,6 +2077,12 @@ void __meminit vmemmap_populate_print_la\n" " \t\tnode_start = 0;\n" @@ -210,8 +204,7 @@ " \n" " static void prot_init_common(unsigned long page_none,\n" "Index: linux-3.6/arch/x86/mm/init_64.c\n" - "===================================================================\n" - "--- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 17:15:03.021828121 +0900\n" + "=================================--- linux-3.6.orig/arch/x86/mm/init_64.c\t2012-10-04 17:15:03.021828121 +0900\n" "+++ linux-3.6/arch/x86/mm/init_64.c\t2012-10-04 17:15:59.240833769 +0900\n" "@@ -993,6 +993,58 @@ vmemmap_populate(struct page *start_page\n" " \treturn 0;\n" @@ -273,8 +266,7 @@ " {\n" " \tif (p_start) {\n" "Index: linux-3.6/include/linux/mm.h\n" - "===================================================================\n" - "--- linux-3.6.orig/include/linux/mm.h\t2012-10-01 08:47:46.000000000 +0900\n" + "=================================--- linux-3.6.orig/include/linux/mm.h\t2012-10-01 08:47:46.000000000 +0900\n" "+++ linux-3.6/include/linux/mm.h\t2012-10-04 17:15:59.246833767 +0900\n" "@@ -1618,7 +1618,8 @@ int vmemmap_populate_basepages(struct pa\n" " \t\t\t\t\t\tunsigned long pages, int node);\n" @@ -285,12 +277,6 @@ "+\t\t\t\t unsigned long size);\n" " \n" " enum mf_flags {\n" - " \tMF_COUNT_INCREASED = 1 << 0,\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>" + " \tMF_COUNT_INCREASED = 1 << 0," -267e72e6c0e75bddeec02cda6de5aa79fce6bd8de33dea52621f7113242b107b +e19d73baf3f2972304f67455f1ee6222e828b3479ee08a0a14eace8c02c5140e
diff --git a/a/1.txt b/N2/1.txt index 86b58dc..1e78b48 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -261,9 +261,3 @@ Index: linux-3.6/include/linux/mm.h enum mf_flags { MF_COUNT_INCREASED = 1 << 0, - --- -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 7bb6ad8..e75507b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 6/10] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap\0" "Date\0Fri, 5 Oct 2012 11:33:27 +0900\0" - "To\0x86@kernel.org" - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org - linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org - cmetcalf@tilera.com - " sparclinux@vger.kernel.org\0" - "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" + "To\0<x86@kernel.org>" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> + <linux-acpi@vger.kernel.org> + <linux-s390@vger.kernel.org> + <linux-sh@vger.kernel.org> + <linux-ia64@vger.kernel.org> + <cmetcalf@tilera.com> + " <sparclinux@vger.kernel.org>\0" + "Cc\0len.brown@intel.com" + wency@cn.fujitsu.com + Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> + minchan.kim@gmail.com + kosaki.motohiro@jp.fujitsu.com rientjes@google.com - liuj97@gmail.com - len.brown@intel.com cl@linux.com - minchan.kim@gmail.com akpm@linux-foundation.org - kosaki.motohiro@jp.fujitsu.com - " wency@cn.fujitsu.com\0" + " liuj97@gmail.com\0" "\00:1\0" "b\0" "For removing memmap region of sparse-vmemmap which is allocated bootmem,\n" @@ -285,12 +285,6 @@ "+\t\t\t\t unsigned long size);\n" " \n" " enum mf_flags {\n" - " \tMF_COUNT_INCREASED = 1 << 0,\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>" + " \tMF_COUNT_INCREASED = 1 << 0," -267e72e6c0e75bddeec02cda6de5aa79fce6bd8de33dea52621f7113242b107b +cf065c5977cae7a5e713489381609a875561cb1deed61b34a9ebaf120396b115
diff --git a/a/1.txt b/N3/1.txt index 86b58dc..1e78b48 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -261,9 +261,3 @@ Index: linux-3.6/include/linux/mm.h enum mf_flags { MF_COUNT_INCREASED = 1 << 0, - --- -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/N3/content_digest index 7bb6ad8..ca1c68d 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 6/10] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap\0" "Date\0Fri, 5 Oct 2012 11:33:27 +0900\0" - "To\0x86@kernel.org" - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org - linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org - cmetcalf@tilera.com - " sparclinux@vger.kernel.org\0" + "To\0<x86@kernel.org>" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> + <linux-acpi@vger.kernel.org> + <linux-s390@vger.kernel.org> + <linux-sh@vger.kernel.org> + <linux-ia64@vger.kernel.org> + <cmetcalf@tilera.com> + " <sparclinux@vger.kernel.org>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" - rientjes@google.com - liuj97@gmail.com - len.brown@intel.com - cl@linux.com - minchan.kim@gmail.com - akpm@linux-foundation.org - kosaki.motohiro@jp.fujitsu.com - " wency@cn.fujitsu.com\0" + <rientjes@google.com> + <liuj97@gmail.com> + <len.brown@intel.com> + <cl@linux.com> + <minchan.kim@gmail.com> + <akpm@linux-foundation.org> + <kosaki.motohiro@jp.fujitsu.com> + " <wency@cn.fujitsu.com>\0" "\00:1\0" "b\0" "For removing memmap region of sparse-vmemmap which is allocated bootmem,\n" @@ -285,12 +285,6 @@ "+\t\t\t\t unsigned long size);\n" " \n" " enum mf_flags {\n" - " \tMF_COUNT_INCREASED = 1 << 0,\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>" + " \tMF_COUNT_INCREASED = 1 << 0," -267e72e6c0e75bddeec02cda6de5aa79fce6bd8de33dea52621f7113242b107b +059dc75a57546f5b5e5eab00afbb97eb68f81bfeec8513882966019594ee3d29
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.