diff for duplicates of <50767012.5080306@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 0adc0ff..bd50cf0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,8 +47,7 @@ very samll. And it does not affect the system. >> 3 files changed, 108 insertions(+), 3 deletions(-) >> >> Index: linux-3.6/drivers/firmware/memmap.c ->> =================================================================== ->> --- linux-3.6.orig/drivers/firmware/memmap.c 2012-10-04 18:27:05.195500420 +0900 +>> =================================>> --- linux-3.6.orig/drivers/firmware/memmap.c 2012-10-04 18:27:05.195500420 +0900 >> +++ linux-3.6/drivers/firmware/memmap.c 2012-10-04 18:27:18.901514330 +0900 >> @@ -21,6 +21,7 @@ >> #include <linux/types.h> @@ -161,7 +160,7 @@ We'll update it. >> + >> + spin_lock(&map_entries_lock); >> + list_for_each_entry(entry, &map_entries, list) ->> + if ((entry->start == start) && (entry->end == end) && +>> + if ((entry->start = start) && (entry->end = end) && >> + (!strcmp(entry->type, type))) { >> + spin_unlock(&map_entries_lock); >> + return entry; @@ -236,8 +235,7 @@ Yasuaki Ishimatsu >> static ssize_t memmap_attr_show(struct kobject *kobj, >> struct attribute *attr, char *buf) >> Index: linux-3.6/include/linux/firmware-map.h ->> =================================================================== ->> --- linux-3.6.orig/include/linux/firmware-map.h 2012-10-04 18:27:05.197500422 +0900 +>> =================================>> --- linux-3.6.orig/include/linux/firmware-map.h 2012-10-04 18:27:05.197500422 +0900 >> +++ linux-3.6/include/linux/firmware-map.h 2012-10-04 18:27:18.904514333 +0900 >> @@ -25,6 +25,7 @@ >> @@ -260,8 +258,7 @@ Yasuaki Ishimatsu >> >> #endif /* _LINUX_FIRMWARE_MAP_H */ >> Index: linux-3.6/mm/memory_hotplug.c ->> =================================================================== ->> --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:27:03.000000000 +0900 +>> =================================>> --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:27:03.000000000 +0900 >> +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 18:28:42.851599524 +0900 >> @@ -1043,7 +1043,7 @@ int offline_memory(u64 start, u64 size) >> return 0; diff --git a/a/content_digest b/N1/content_digest index 0b3891d..60ccb38 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0CAHGf_=rc9z7OmuH-pamQmPE=dpy3zPX3fXab=-APo2_NX7=KpQ@mail.gmail.com\0" "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0Re: [PATCH 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" - "Date\0Thu, 11 Oct 2012 16:06:58 +0900\0" + "Date\0Thu, 11 Oct 2012 07:06:58 +0000\0" "To\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\0" "Cc\0x86@kernel.org" linux-mm@kvack.org @@ -73,8 +73,7 @@ ">> 3 files changed, 108 insertions(+), 3 deletions(-)\n" ">>\n" ">> Index: linux-3.6/drivers/firmware/memmap.c\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/drivers/firmware/memmap.c 2012-10-04 18:27:05.195500420 +0900\n" + ">> =================================>> --- linux-3.6.orig/drivers/firmware/memmap.c 2012-10-04 18:27:05.195500420 +0900\n" ">> +++ linux-3.6/drivers/firmware/memmap.c 2012-10-04 18:27:18.901514330 +0900\n" ">> @@ -21,6 +21,7 @@\n" ">> #include <linux/types.h>\n" @@ -187,7 +186,7 @@ ">> +\n" ">> + spin_lock(&map_entries_lock);\n" ">> + list_for_each_entry(entry, &map_entries, list)\n" - ">> + if ((entry->start == start) && (entry->end == end) &&\n" + ">> + if ((entry->start = start) && (entry->end = end) &&\n" ">> + (!strcmp(entry->type, type))) {\n" ">> + spin_unlock(&map_entries_lock);\n" ">> + return entry;\n" @@ -262,8 +261,7 @@ ">> static ssize_t memmap_attr_show(struct kobject *kobj,\n" ">> struct attribute *attr, char *buf)\n" ">> Index: linux-3.6/include/linux/firmware-map.h\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/include/linux/firmware-map.h 2012-10-04 18:27:05.197500422 +0900\n" + ">> =================================>> --- linux-3.6.orig/include/linux/firmware-map.h 2012-10-04 18:27:05.197500422 +0900\n" ">> +++ linux-3.6/include/linux/firmware-map.h 2012-10-04 18:27:18.904514333 +0900\n" ">> @@ -25,6 +25,7 @@\n" ">>\n" @@ -286,8 +284,7 @@ ">>\n" ">> #endif /* _LINUX_FIRMWARE_MAP_H */\n" ">> Index: linux-3.6/mm/memory_hotplug.c\n" - ">> ===================================================================\n" - ">> --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:27:03.000000000 +0900\n" + ">> =================================>> --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-04 18:27:03.000000000 +0900\n" ">> +++ linux-3.6/mm/memory_hotplug.c 2012-10-04 18:28:42.851599524 +0900\n" ">> @@ -1043,7 +1043,7 @@ int offline_memory(u64 start, u64 size)\n" ">> return 0;\n" @@ -317,4 +314,4 @@ "> Other than that, looks ok to me.\n" > -d3bdda9cdb831daf2107124ec7d3c27cd6fe180186b8d48f04c5728014424e72 +6997db32ac0e7fc1cc592470cd9f6b54b72d6270997a71d0d7843cc390a357ac
diff --git a/a/content_digest b/N2/content_digest index 0b3891d..0e475ad 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,23 +5,23 @@ "Subject\0Re: [PATCH 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" "Date\0Thu, 11 Oct 2012 16:06:58 +0900\0" "To\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\0" - "Cc\0x86@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 + wency@cn.fujitsu.com + 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 + 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 + linuxppc-dev@lists.ozlabs.org akpm@linux-foundation.org - " wency@cn.fujitsu.com\0" + " liuj97@gmail.com\0" "\00:1\0" "b\0" "2012/10/06 4:36, KOSAKI Motohiro wrote:\n" @@ -317,4 +317,4 @@ "> Other than that, looks ok to me.\n" > -d3bdda9cdb831daf2107124ec7d3c27cd6fe180186b8d48f04c5728014424e72 +2bc1ba2eefd586872875eb4bafc8ea2264b30f77377ef7ac8ee1f48d6aea2446
diff --git a/a/1.txt b/N3/1.txt index 0adc0ff..061649a 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -290,3 +290,10 @@ Yasuaki Ishimatsu > > Other than that, looks ok to me. > + + +-- +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 0b3891d..9d458d9 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -315,6 +315,13 @@ ">\n" ">\n" "> Other than that, looks ok to me.\n" - > + ">\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>" -d3bdda9cdb831daf2107124ec7d3c27cd6fe180186b8d48f04c5728014424e72 +357a87099da46629dbbf1f1b55afcf505b5d17a586d669e9f4bf0e38324ecd05
diff --git a/a/content_digest b/N4/content_digest index 0b3891d..31a5ff0 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -5,23 +5,23 @@ "Subject\0Re: [PATCH 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" "Date\0Thu, 11 Oct 2012 16:06:58 +0900\0" "To\0KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\0" - "Cc\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 - rientjes@google.com - liuj97@gmail.com - len.brown@intel.com - cl@linux.com - minchan.kim@gmail.com - akpm@linux-foundation.org - " wency@cn.fujitsu.com\0" + "Cc\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> + <rientjes@google.com> + <liuj97@gmail.com> + <len.brown@intel.com> + <cl@linux.com> + <minchan.kim@gmail.com> + <akpm@linux-foundation.org> + " <wency@cn.fujitsu.com>\0" "\00:1\0" "b\0" "2012/10/06 4:36, KOSAKI Motohiro wrote:\n" @@ -317,4 +317,4 @@ "> Other than that, looks ok to me.\n" > -d3bdda9cdb831daf2107124ec7d3c27cd6fe180186b8d48f04c5728014424e72 +a4dbb213a7d956d7b6819b9c63379295b6d5fe3807229e6131f5a3d046947d9c
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.