diff for duplicates of <5081609C.9080702@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 1ec146d..8a8277b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,8 +53,7 @@ are offlined before step6. >>> 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( >>> } @@ -95,7 +94,7 @@ are offlined before step6. >>> + 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); @@ -113,8 +112,7 @@ are offlined before step6. >>> * 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( >>> { @@ -136,8 +134,7 @@ are offlined before step6. >>> 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) >>> @@ -194,9 +191,3 @@ Wen Congyang > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > - --- -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 575c333..731b5c7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\050812F13.20503@cn.fujitsu.com\0" "From\0Wen Congyang <wencongyang@gmail.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 22:15:56 +0800\0" + "Date\0Fri, 19 Oct 2012 14:15:56 +0000\0" "To\0Wen Congyang <wency@cn.fujitsu.com>\0" "Cc\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>" Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> @@ -81,8 +81,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" @@ -123,7 +122,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" @@ -141,8 +140,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" @@ -164,8 +162,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" @@ -221,12 +218,6 @@ "> To unsubscribe from this list: send the line \"unsubscribe linux-acpi\" in\n" "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\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>" + > -f7c081215f578e439c6d734e4ef35947b13d44e86abcd56d7d1620097ec26807 +879a2cd95bb28510ce0a0e2c502a11a98837db317409bc4d0aa05ea1b3d3778f
diff --git a/a/1.txt b/N2/1.txt index 1ec146d..b6cda8a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -194,9 +194,3 @@ Wen Congyang > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > - --- -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 575c333..bbb5a43 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,24 +6,24 @@ "Subject\0Re: [PATCH 1/10] memory-hotplug : check whether memory is offline or not when removing memory\0" "Date\0Fri, 19 Oct 2012 22:15:56 +0800\0" "To\0Wen Congyang <wency@cn.fujitsu.com>\0" - "Cc\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>" - Yasuaki 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 + KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.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 2012/10/19 18:44, Wen Congyang Wrote:\n" @@ -221,12 +221,6 @@ "> To unsubscribe from this list: send the line \"unsubscribe linux-acpi\" in\n" "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\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>" + > -f7c081215f578e439c6d734e4ef35947b13d44e86abcd56d7d1620097ec26807 +86ffbdb9e847b09090d1d043d148de58b86943b4e2b7536126fe81c93081732b
diff --git a/a/1.txt b/N3/1.txt index 1ec146d..b6cda8a 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -194,9 +194,3 @@ Wen Congyang > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > - --- -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 575c333..e23f2ce 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -221,12 +221,6 @@ "> To unsubscribe from this list: send the line \"unsubscribe linux-acpi\" in\n" "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\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>" + > -f7c081215f578e439c6d734e4ef35947b13d44e86abcd56d7d1620097ec26807 +97d7f827eed922cf0fff753c2528c5b8a9ba673c5b0a8822d69069ce15a882ad
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.