diff for duplicates of <506E451E.1050403@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 93a3cc6..7658101 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,8 +20,7 @@ Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> 3 files changed, 59 insertions(+), 2 deletions(-) Index: linux-3.6/drivers/base/memory.c -=================================================================== ---- linux-3.6.orig/drivers/base/memory.c 2012-10-04 14:22:57.000000000 +0900 +=================================--- linux-3.6.orig/drivers/base/memory.c 2012-10-04 14:22:57.000000000 +0900 +++ linux-3.6/drivers/base/memory.c 2012-10-04 14:45:46.653585860 +0900 @@ -70,6 +70,45 @@ void unregister_memory_isolate_notifier( } @@ -52,7 +51,7 @@ Index: linux-3.6/drivers/base/memory.c + mem = find_memory_block_hinted(section, mem); + if (!mem) + continue; -+ if (mem->state == MEM_OFFLINE) ++ if (mem->state = MEM_OFFLINE) + continue; + + kobject_put(&mem->dev.kobj); @@ -70,8 +69,7 @@ Index: linux-3.6/drivers/base/memory.c * register_memory - Setup a sysfs device for a memory block */ Index: linux-3.6/include/linux/memory.h -=================================================================== ---- linux-3.6.orig/include/linux/memory.h 2012-10-02 18:00:22.000000000 +0900 +=================================--- linux-3.6.orig/include/linux/memory.h 2012-10-02 18:00:22.000000000 +0900 +++ linux-3.6/include/linux/memory.h 2012-10-04 14:44:40.902581028 +0900 @@ -106,6 +106,10 @@ static inline int memory_isolate_notify( { @@ -93,8 +91,7 @@ Index: linux-3.6/include/linux/memory.h enum mem_add_context { BOOT, HOTPLUG }; #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ Index: linux-3.6/mm/memory_hotplug.c -=================================================================== ---- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 14:31:08.000000000 +0900 +=================================--- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 14:31:08.000000000 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 14:58:22.449687986 +0900 @@ -1045,8 +1045,21 @@ int offline_memory(u64 start, u64 size) @@ -120,9 +117,3 @@ Index: linux-3.6/mm/memory_hotplug.c } EXPORT_SYMBOL_GPL(remove_memory); #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 f0ed41f..4af8ead 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 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" - "Date\0Fri, 5 Oct 2012 11:25:34 +0900\0" + "Date\0Fri, 05 Oct 2012 02:25:34 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -45,8 +45,7 @@ " 3 files changed, 59 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-3.6/drivers/base/memory.c\n" - "===================================================================\n" - "--- linux-3.6.orig/drivers/base/memory.c\t2012-10-04 14:22:57.000000000 +0900\n" + "=================================--- linux-3.6.orig/drivers/base/memory.c\t2012-10-04 14:22:57.000000000 +0900\n" "+++ linux-3.6/drivers/base/memory.c\t2012-10-04 14:45:46.653585860 +0900\n" "@@ -70,6 +70,45 @@ void unregister_memory_isolate_notifier(\n" " }\n" @@ -77,7 +76,7 @@ "+\t\tmem = find_memory_block_hinted(section, mem);\n" "+\t\tif (!mem)\n" "+\t\t\tcontinue;\n" - "+\t\tif (mem->state == MEM_OFFLINE)\n" + "+\t\tif (mem->state = MEM_OFFLINE)\n" "+\t\t\tcontinue;\n" "+\n" "+\t\tkobject_put(&mem->dev.kobj);\n" @@ -95,8 +94,7 @@ " * register_memory - Setup a sysfs device for a memory block\n" " */\n" "Index: linux-3.6/include/linux/memory.h\n" - "===================================================================\n" - "--- linux-3.6.orig/include/linux/memory.h\t2012-10-02 18:00:22.000000000 +0900\n" + "=================================--- linux-3.6.orig/include/linux/memory.h\t2012-10-02 18:00:22.000000000 +0900\n" "+++ linux-3.6/include/linux/memory.h\t2012-10-04 14:44:40.902581028 +0900\n" "@@ -106,6 +106,10 @@ static inline int memory_isolate_notify(\n" " {\n" @@ -118,8 +116,7 @@ " enum mem_add_context { BOOT, HOTPLUG };\n" " #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */\n" "Index: linux-3.6/mm/memory_hotplug.c\n" - "===================================================================\n" - "--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 14:31:08.000000000 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 14:31:08.000000000 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 14:58:22.449687986 +0900\n" "@@ -1045,8 +1045,21 @@ int offline_memory(u64 start, u64 size)\n" " \n" @@ -144,12 +141,6 @@ "+\treturn ret;\n" " }\n" " EXPORT_SYMBOL_GPL(remove_memory);\n" - " #else\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>" + #else -d6bbe3103b9575f6a34d2349e7f6f039e47e9b89e08a842ab586469b1e178caf +8178d9e73333dd78ec91079e9f85f8e6bdf40739b7dc0c8cc3370a54ada5c00c
diff --git a/a/1.txt b/N2/1.txt index 93a3cc6..e095583 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -120,9 +120,3 @@ Index: linux-3.6/mm/memory_hotplug.c } EXPORT_SYMBOL_GPL(remove_memory); #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 f0ed41f..9bde516 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 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" "Date\0Fri, 5 Oct 2012 11:25:34 +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" "When calling remove_memory(), the memory should be offline. If the function\n" @@ -144,12 +144,6 @@ "+\treturn ret;\n" " }\n" " EXPORT_SYMBOL_GPL(remove_memory);\n" - " #else\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>" + #else -d6bbe3103b9575f6a34d2349e7f6f039e47e9b89e08a842ab586469b1e178caf +25ff92bb65ee85d12e2fd4422df6059b4b6f9db716b1aa78520d14ec8e2ddcd5
diff --git a/a/1.txt b/N3/1.txt index 93a3cc6..e095583 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -120,9 +120,3 @@ Index: linux-3.6/mm/memory_hotplug.c } EXPORT_SYMBOL_GPL(remove_memory); #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/N3/content_digest index f0ed41f..a0f4f6f 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 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" "Date\0Fri, 5 Oct 2012 11:25:34 +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" "When calling remove_memory(), the memory should be offline. If the function\n" @@ -144,12 +144,6 @@ "+\treturn ret;\n" " }\n" " EXPORT_SYMBOL_GPL(remove_memory);\n" - " #else\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>" + #else -d6bbe3103b9575f6a34d2349e7f6f039e47e9b89e08a842ab586469b1e178caf +6451c41ae5f07a555b96afbca9a15bda382b8c973f056c40ab8fd1fdc65a27d4
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.