diff for duplicates of <alpine.DEB.2.01.1004201104170.13016@bogon.housecafe.de>

diff --git a/a/1.txt b/N1/1.txt
index a06db49..98d2b9c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,19 +3,21 @@ On Tue, 20 Apr 2010 at 22:18, Michael Ellerman wrote:
 
 I added GFP_KERNEL to kstrdup to make the compile error go away:
 
-fs/proc/proc_devtree.c: In function ‘unslash_name’:
-fs/proc/proc_devtree.c:183: error: too few arguments to function ‘kstrdup’
+fs/proc/proc_devtree.c: In function =E2=80=98unslash_name=E2=80=99:
+fs/proc/proc_devtree.c:183: error: too few arguments to function =E2=80=98k=
+strdup=E2=80=99
 make[2]: *** [fs/proc/proc_devtree.o] Error 1
 make[1]: *** [fs/proc] Error 2
 make: *** [fs] Error 2
 
-And now 2.6.34-rc5 compiles and boots without the warning. Thanks! 
+And now 2.6.34-rc5 compiles and boots without the warning. Thanks!=20
 New dmesg and /proc/device-tree on:
 
   http://nerdbynature.de/bits/2.6.34-rc1/xlate_proc_name/
 
-Alexey mentioned that this is "wasteful" - does it make the kernel slower? 
-I have not done any performance tests, but I'd rather stick with the 
+Alexey mentioned that this is "wasteful" - does it make the kernel slower?=
+=20
+I have not done any performance tests, but I'd rather stick with the=20
 warning than make this Powerbook G4 any more slower :-\
 
 
@@ -27,41 +29,41 @@ index ce94801..019581d 100644
 --- a/fs/proc/proc_devtree.c
 +++ b/fs/proc/proc_devtree.c
 @@ -176,6 +176,24 @@ retry:
- 	return fixed_name;
+ =09return fixed_name;
  }
- 
+=20
 +static const char *unslash_name(const char *name)
 +{
-+	char *p, *fixed_name;
++=09char *p, *fixed_name;
 +
-+	fixed_name = kstrdup(name, GFP_KERNEL);
-+	if (!fixed_name) {
-+		printk(KERN_ERR "device-tree: Out of memory trying to unslash "
-+				"name \"%s\"\n", name);
-+	return name;
-+	}
++=09fixed_name =3D kstrdup(name, GFP_KERNEL);
++=09if (!fixed_name) {
++=09=09printk(KERN_ERR "device-tree: Out of memory trying to unslash "
++=09=09=09=09"name \"%s\"\n", name);
++=09return name;
++=09}
 +
-+	p = fixed_name;
-+	while ((p = strstr(p, "/")))
-+		*p++ = '_';
++=09p =3D fixed_name;
++=09while ((p =3D strstr(p, "/")))
++=09=09*p++ =3D '_';
 +
-+	return fixed_name;
++=09return fixed_name;
 +}
 +
  /*
   * Process a node, adding entries for its children and its properties.
   */
 @@ -212,6 +230,9 @@ void proc_device_tree_add_node(struct device_node *np,
- 		if (duplicate_name(de, p))
- 			p = fixup_name(np, de, p);
- 
-+		if (strstr(p, "/"))
-+			p = unslash_name(p);
+ =09=09if (duplicate_name(de, p))
+ =09=09=09p =3D fixup_name(np, de, p);
+=20
++=09=09if (strstr(p, "/"))
++=09=09=09p =3D unslash_name(p);
 +
- 		ent = __proc_device_tree_add_prop(de, pp, p);
- 		if (ent == NULL)
- 			break;
--- 
+ =09=09ent =3D __proc_device_tree_add_prop(de, pp, p);
+ =09=09if (ent =3D=3D NULL)
+ =09=09=09break;
+--=20
 BOFH excuse #369:
 
 Virus transmitted from computer to sysadmins.
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 2592c61..b92c2e4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -23,8 +23,8 @@
   "To\0Michael Ellerman <michael\@ellerman.id.au>\0"
 ]
 [
-  "Cc\0Rafael J. Wysocki <rjw\@sisk.pl>",
-  " Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
+  "Cc\0Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
+  " Rafael J. Wysocki <rjw\@sisk.pl>",
   " linuxppc-dev\@ozlabs.org",
   " schwab\@linux-m68k.org",
   " Kernel Testers List <kernel-testers\@vger.kernel.org>",
@@ -43,19 +43,21 @@
   "\n",
   "I added GFP_KERNEL to kstrdup to make the compile error go away:\n",
   "\n",
-  "fs/proc/proc_devtree.c: In function \342\200\230unslash_name\342\200\231:\n",
-  "fs/proc/proc_devtree.c:183: error: too few arguments to function \342\200\230kstrdup\342\200\231\n",
+  "fs/proc/proc_devtree.c: In function =E2=80=98unslash_name=E2=80=99:\n",
+  "fs/proc/proc_devtree.c:183: error: too few arguments to function =E2=80=98k=\n",
+  "strdup=E2=80=99\n",
   "make[2]: *** [fs/proc/proc_devtree.o] Error 1\n",
   "make[1]: *** [fs/proc] Error 2\n",
   "make: *** [fs] Error 2\n",
   "\n",
-  "And now 2.6.34-rc5 compiles and boots without the warning. Thanks! \n",
+  "And now 2.6.34-rc5 compiles and boots without the warning. Thanks!=20\n",
   "New dmesg and /proc/device-tree on:\n",
   "\n",
   "  http://nerdbynature.de/bits/2.6.34-rc1/xlate_proc_name/\n",
   "\n",
-  "Alexey mentioned that this is \"wasteful\" - does it make the kernel slower? \n",
-  "I have not done any performance tests, but I'd rather stick with the \n",
+  "Alexey mentioned that this is \"wasteful\" - does it make the kernel slower?=\n",
+  "=20\n",
+  "I have not done any performance tests, but I'd rather stick with the=20\n",
   "warning than make this Powerbook G4 any more slower :-\\\n",
   "\n",
   "\n",
@@ -67,44 +69,44 @@
   "--- a/fs/proc/proc_devtree.c\n",
   "+++ b/fs/proc/proc_devtree.c\n",
   "\@\@ -176,6 +176,24 \@\@ retry:\n",
-  " \treturn fixed_name;\n",
+  " =09return fixed_name;\n",
   " }\n",
-  " \n",
+  "=20\n",
   "+static const char *unslash_name(const char *name)\n",
   "+{\n",
-  "+\tchar *p, *fixed_name;\n",
+  "+=09char *p, *fixed_name;\n",
   "+\n",
-  "+\tfixed_name = kstrdup(name, GFP_KERNEL);\n",
-  "+\tif (!fixed_name) {\n",
-  "+\t\tprintk(KERN_ERR \"device-tree: Out of memory trying to unslash \"\n",
-  "+\t\t\t\t\"name \\\"%s\\\"\\n\", name);\n",
-  "+\treturn name;\n",
-  "+\t}\n",
+  "+=09fixed_name =3D kstrdup(name, GFP_KERNEL);\n",
+  "+=09if (!fixed_name) {\n",
+  "+=09=09printk(KERN_ERR \"device-tree: Out of memory trying to unslash \"\n",
+  "+=09=09=09=09\"name \\\"%s\\\"\\n\", name);\n",
+  "+=09return name;\n",
+  "+=09}\n",
   "+\n",
-  "+\tp = fixed_name;\n",
-  "+\twhile ((p = strstr(p, \"/\")))\n",
-  "+\t\t*p++ = '_';\n",
+  "+=09p =3D fixed_name;\n",
+  "+=09while ((p =3D strstr(p, \"/\")))\n",
+  "+=09=09*p++ =3D '_';\n",
   "+\n",
-  "+\treturn fixed_name;\n",
+  "+=09return fixed_name;\n",
   "+}\n",
   "+\n",
   " /*\n",
   "  * Process a node, adding entries for its children and its properties.\n",
   "  */\n",
   "\@\@ -212,6 +230,9 \@\@ void proc_device_tree_add_node(struct device_node *np,\n",
-  " \t\tif (duplicate_name(de, p))\n",
-  " \t\t\tp = fixup_name(np, de, p);\n",
-  " \n",
-  "+\t\tif (strstr(p, \"/\"))\n",
-  "+\t\t\tp = unslash_name(p);\n",
+  " =09=09if (duplicate_name(de, p))\n",
+  " =09=09=09p =3D fixup_name(np, de, p);\n",
+  "=20\n",
+  "+=09=09if (strstr(p, \"/\"))\n",
+  "+=09=09=09p =3D unslash_name(p);\n",
   "+\n",
-  " \t\tent = __proc_device_tree_add_prop(de, pp, p);\n",
-  " \t\tif (ent == NULL)\n",
-  " \t\t\tbreak;\n",
-  "-- \n",
+  " =09=09ent =3D __proc_device_tree_add_prop(de, pp, p);\n",
+  " =09=09if (ent =3D=3D NULL)\n",
+  " =09=09=09break;\n",
+  "--=20\n",
   "BOFH excuse #369:\n",
   "\n",
   "Virus transmitted from computer to sysadmins."
 ]
 
-8294fa3f376ea04c071af4d9294b024843d6cd85dad4726e4526cec8ab830124
+ed2ea679fe1abff09576074ad96574419d10ab1bc1943c5f63cefdced4259e2d
