diff for duplicates of <506E4571.4090608@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index cde9c58..ec0e8a6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,7 @@ Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> 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> @@ -125,7 +124,7 @@ Index: linux-3.6/drivers/firmware/memmap.c + + 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; @@ -189,8 +188,7 @@ Index: linux-3.6/drivers/firmware/memmap.c 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 @@ @@ -213,8 +211,7 @@ Index: linux-3.6/include/linux/firmware-map.h #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 9032190..601cde8 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 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" - "Date\0Fri, 5 Oct 2012 11:26:57 +0900\0" + "Date\0Fri, 05 Oct 2012 02:26:57 +0000\0" "To\0x86@kernel.org" linux-mm@kvack.org linux-kernel@vger.kernel.org @@ -47,8 +47,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\t2012-10-04 18:27:05.195500420 +0900\n" + "=================================--- linux-3.6.orig/drivers/firmware/memmap.c\t2012-10-04 18:27:05.195500420 +0900\n" "+++ linux-3.6/drivers/firmware/memmap.c\t2012-10-04 18:27:18.901514330 +0900\n" "@@ -21,6 +21,7 @@\n" " #include <linux/types.h>\n" @@ -150,7 +149,7 @@ "+\n" "+\tspin_lock(&map_entries_lock);\n" "+\tlist_for_each_entry(entry, &map_entries, list)\n" - "+\t\tif ((entry->start == start) && (entry->end == end) &&\n" + "+\t\tif ((entry->start = start) && (entry->end = end) &&\n" "+\t\t (!strcmp(entry->type, type))) {\n" "+\t\t\tspin_unlock(&map_entries_lock);\n" "+\t\t\treturn entry;\n" @@ -214,8 +213,7 @@ " static ssize_t memmap_attr_show(struct kobject *kobj,\n" " \t\t\t\tstruct 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\t2012-10-04 18:27:05.197500422 +0900\n" + "=================================--- linux-3.6.orig/include/linux/firmware-map.h\t2012-10-04 18:27:05.197500422 +0900\n" "+++ linux-3.6/include/linux/firmware-map.h\t2012-10-04 18:27:18.904514333 +0900\n" "@@ -25,6 +25,7 @@\n" " \n" @@ -238,8 +236,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\t2012-10-04 18:27:03.000000000 +0900\n" + "=================================--- linux-3.6.orig/mm/memory_hotplug.c\t2012-10-04 18:27:03.000000000 +0900\n" "+++ linux-3.6/mm/memory_hotplug.c\t2012-10-04 18:28:42.851599524 +0900\n" "@@ -1043,7 +1043,7 @@ int offline_memory(u64 start, u64 size)\n" " \treturn 0;\n" @@ -265,4 +262,4 @@ " \treturn ret;\n" } -2c1640df3af0d3b2e701fc7f7881ee7c67ba667162f5d1de359db84681be89c2 +8279ce4ab8d26c635aa064f037646e4fd055517c0d8fe50b8c655a82524649a7
diff --git a/a/content_digest b/N2/content_digest index 9032190..ade917e 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 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" "Date\0Fri, 5 Oct 2012 11:26:57 +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 (hot)adding memory into system, /sys/firmware/memmap/X/{end, start, type}\n" @@ -265,4 +265,4 @@ " \treturn ret;\n" } -2c1640df3af0d3b2e701fc7f7881ee7c67ba667162f5d1de359db84681be89c2 +658a06b049bd15a051e785017d1b0ec1288607736fc889dc09e8ac0faaca6a7a
diff --git a/a/1.txt b/N3/1.txt index cde9c58..9f14a7d 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -239,3 +239,9 @@ Index: linux-3.6/mm/memory_hotplug.c unlock_memory_hotplug(); return ret; } + +-- +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 9032190..1797f0b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -263,6 +263,12 @@ "+out:\n" " \tunlock_memory_hotplug();\n" " \treturn ret;\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>" -2c1640df3af0d3b2e701fc7f7881ee7c67ba667162f5d1de359db84681be89c2 +2761936bed1ebe6505f6e507221bfa5de0b000b7f6785e9901ebeb3663974b6d
diff --git a/a/content_digest b/N4/content_digest index 9032190..57b6e3e 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -2,25 +2,25 @@ "From\0Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>\0" "Subject\0[PATCH 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs\0" "Date\0Fri, 5 Oct 2012 11:26:57 +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 (hot)adding memory into system, /sys/firmware/memmap/X/{end, start, type}\n" @@ -265,4 +265,4 @@ " \treturn ret;\n" } -2c1640df3af0d3b2e701fc7f7881ee7c67ba667162f5d1de359db84681be89c2 +6406d19fd989aabd862a0ee68d5b3dab71de965141c562a4c9d84f83caf7a9d2
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.