diff for duplicates of <50812F13.20503@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 57ec8cf..5e067cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,8 +33,7 @@ Wen Congyang >> 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( >> } @@ -75,7 +74,7 @@ Wen Congyang >> + 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); @@ -93,8 +92,7 @@ Wen Congyang >> * 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( >> { @@ -116,8 +114,7 @@ Wen Congyang >> 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) >> @@ -158,10 +155,4 @@ Wen Congyang >> 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> -> - --- -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 dc53322..cc5cb2b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0CAHGf_=rVDm-JygjPoLHbmF28Dgd52HFc4-b5KCxhEieG60okuw@mail.gmail.com\0" "From\0Wen Congyang <wency@cn.fujitsu.com>\0" "Subject\0Re: [PATCH 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" - "Date\0Fri, 19 Oct 2012 18:44:35 +0800\0" + "Date\0Fri, 19 Oct 2012 10:44:35 +0000\0" "To\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\0" "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" x86@kernel.org @@ -59,8 +59,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 2012-10-04 14:22:57.000000000 +0900\n" + ">> =================================>> --- linux-3.6.orig/drivers/base/memory.c 2012-10-04 14:22:57.000000000 +0900\n" ">> +++ linux-3.6/drivers/base/memory.c 2012-10-04 14:45:46.653585860 +0900\n" ">> @@ -70,6 +70,45 @@ void unregister_memory_isolate_notifier(\n" ">> }\n" @@ -101,7 +100,7 @@ ">> + mem = find_memory_block_hinted(section, mem);\n" ">> + if (!mem)\n" ">> + continue;\n" - ">> + if (mem->state == MEM_OFFLINE)\n" + ">> + if (mem->state = MEM_OFFLINE)\n" ">> + continue;\n" ">> +\n" ">> + kobject_put(&mem->dev.kobj);\n" @@ -119,8 +118,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 2012-10-02 18:00:22.000000000 +0900\n" + ">> =================================>> --- linux-3.6.orig/include/linux/memory.h 2012-10-02 18:00:22.000000000 +0900\n" ">> +++ linux-3.6/include/linux/memory.h 2012-10-04 14:44:40.902581028 +0900\n" ">> @@ -106,6 +106,10 @@ static inline int memory_isolate_notify(\n" ">> {\n" @@ -142,8 +140,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 2012-10-04 14:31:08.000000000 +0900\n" + ">> =================================>> --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 14:31:08.000000000 +0900\n" ">> +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 14:58:22.449687986 +0900\n" ">> @@ -1045,8 +1045,21 @@ int offline_memory(u64 start, u64 size)\n" ">>\n" @@ -184,12 +181,6 @@ ">> 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>\n" - "> \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>" + > -7ed66bd1d46dfd8a39a310ad43ce6e2536ff11c3b5281cb03fbcaaec94b909d8 +0fb1226db588f7879067c4d96a1837dbc6c76cb36753a4e305b06bdedffd8450
diff --git a/a/1.txt b/N2/1.txt index 57ec8cf..034efb2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -158,10 +158,4 @@ Wen Congyang >> 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> -> - --- -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 dc53322..df23d74 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,23 +5,23 @@ "Subject\0Re: [PATCH 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" "Date\0Fri, 19 Oct 2012 18:44:35 +0800\0" "To\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\0" - "Cc\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>" - x86@kernel.org - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0linux-s390@vger.kernel.org" + linux-ia64@vger.kernel.org + len.brown@intel.com linux-acpi@vger.kernel.org - linux-s390@vger.kernel.org linux-sh@vger.kernel.org - linux-ia64@vger.kernel.org + x86@kernel.org + linux-kernel@vger.kernel.org cmetcalf@tilera.com - sparclinux@vger.kernel.org + linux-mm@kvack.org + Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> + minchan.kim@gmail.com rientjes@google.com - liuj97@gmail.com - len.brown@intel.com + sparclinux@vger.kernel.org cl@linux.com - minchan.kim@gmail.com - " akpm@linux-foundation.org\0" + linuxppc-dev@lists.ozlabs.org + akpm@linux-foundation.org + " liuj97@gmail.com\0" "\00:1\0" "b\0" "At 10/06/2012 03:27 AM, KOSAKI Motohiro Wrote:\n" @@ -184,12 +184,6 @@ ">> 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>\n" - "> \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>" + > -7ed66bd1d46dfd8a39a310ad43ce6e2536ff11c3b5281cb03fbcaaec94b909d8 +509ba53c126ce19a4f125b92f76c23468bab82dc6a976dea2d42066eb4f8136e
diff --git a/a/1.txt b/N3/1.txt index 57ec8cf..034efb2 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -158,10 +158,4 @@ Wen Congyang >> 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> -> - --- -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 dc53322..95a177e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -184,12 +184,6 @@ ">> 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>\n" - "> \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>" + > -7ed66bd1d46dfd8a39a310ad43ce6e2536ff11c3b5281cb03fbcaaec94b909d8 +c7e4c31b0506807e1896c96831c2d8b513b1de99e57efba5dcc0de818a8efb88
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.