diff for duplicates of <20100830000751.2b845d05@debxo> diff --git a/a/1.txt b/N1/1.txt index a656211..cfe9595 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -128,10 +128,10 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node }; + void *res[] = { &node }; + -+ if (node = -1) ++ if (node == -1) + return 0; + -+ if (olpc_ofw("peer", args, res) || node = -1) ++ if (olpc_ofw("peer", args, res) || node == -1) + return 0; + + return node; @@ -142,10 +142,10 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node }; + void *res[] = { &node }; + -+ if (node = -1) ++ if (node == -1) + return 0; + -+ if (olpc_ofw("child", args, res) || node = -1) { ++ if (olpc_ofw("child", args, res) || node == -1) { + pr_err("PROM: %s: fetching child failed!\n", __func__); + return 0; + } @@ -159,7 +159,7 @@ index 0000000..fb04d8a + int len; + void *res[] = { &len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("getproplen", args, res)) { @@ -199,7 +199,7 @@ index 0000000..fb04d8a + + buf[0] = '\0'; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("nextprop", args, res) || success != 1) @@ -214,7 +214,7 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node, buf, (void *)buflen }; + void *res[] = { len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("package-to-path", args, res) || *len < 1) @@ -282,7 +282,7 @@ index d9396a4..9779039 100644 + of_pdt_init_devicetree(); + proc_device_tree = proc_mkdir("device-tree", NULL); - if (proc_device_tree = NULL) + if (proc_device_tree == NULL) return; diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h index 9945e58..b4bd0ee 100644 diff --git a/a/content_digest b/N1/content_digest index c354c64..1f3f5eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,20 @@ "ref\020100829235100.6dcedcb8@debxo\0" "From\0Andres Salomon <dilinger@queued.net>\0" "Subject\0[PATCH 9/9] x86: OLPC: add OLPC device-tree support\0" - "Date\0Mon, 30 Aug 2010 04:07:51 +0000\0" - "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" - "Cc\0pgf-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org" - x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Mitch Bradley <wmb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org> - mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org - hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org - sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org - cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org - " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" + "Date\0Mon, 30 Aug 2010 00:07:51 -0400\0" + "To\0devicetree-discuss@lists.ozlabs.org\0" + "Cc\0sparclinux@vger.kernel.org" + x86@kernel.org + tglx@linutronix.de + mingo@redhat.com + hpa@zytor.com + cjb@laptop.org + Mitch Bradley <wmb@laptop.org> + pgf@laptop.org + linux-kernel@vger.kernel.org + davem@davemloft.net + grant.likely@secretlab.ca + " Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>\0" "\00:1\0" "b\0" "\n" @@ -146,10 +148,10 @@ "+\tconst void *args[] = { (void *)node };\n" "+\tvoid *res[] = { &node };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn 0;\n" "+\n" - "+\tif (olpc_ofw(\"peer\", args, res) || node = -1)\n" + "+\tif (olpc_ofw(\"peer\", args, res) || node == -1)\n" "+\t\treturn 0;\n" "+\n" "+\treturn node;\n" @@ -160,10 +162,10 @@ "+\tconst void *args[] = { (void *)node };\n" "+\tvoid *res[] = { &node };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn 0;\n" "+\n" - "+\tif (olpc_ofw(\"child\", args, res) || node = -1) {\n" + "+\tif (olpc_ofw(\"child\", args, res) || node == -1) {\n" "+\t\tpr_err(\"PROM: %s: fetching child failed!\\n\", __func__);\n" "+\t\treturn 0;\n" "+\t}\n" @@ -177,7 +179,7 @@ "+\tint len;\n" "+\tvoid *res[] = { &len };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"getproplen\", args, res)) {\n" @@ -217,7 +219,7 @@ "+\n" "+\tbuf[0] = '\\0';\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"nextprop\", args, res) || success != 1)\n" @@ -232,7 +234,7 @@ "+\tconst void *args[] = { (void *)node, buf, (void *)buflen };\n" "+\tvoid *res[] = { len };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"package-to-path\", args, res) || *len < 1)\n" @@ -300,7 +302,7 @@ "+\t\tof_pdt_init_devicetree();\n" "+\n" " \tproc_device_tree = proc_mkdir(\"device-tree\", NULL);\n" - " \tif (proc_device_tree = NULL)\n" + " \tif (proc_device_tree == NULL)\n" " \t\treturn;\n" "diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h\n" "index 9945e58..b4bd0ee 100644\n" @@ -317,4 +319,4 @@ "-- \n" 1.5.6.5 -1056364307e8b1e763b6169a52972e1613cf7dac96b67a5b1d7350e6997deb89 +ef7937095e9fcce3513156840131cb98f535521928b7004e02e22d378988cf08
diff --git a/a/1.txt b/N2/1.txt index a656211..6602477 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,7 @@ This also adds an init hook to proc_device_tree_init so that we can ensure the device tree has been built prior to the proc_root_init stuff attempting to populate /proc/device-tree. -Signed-off-by: Andres Salomon <dilinger@queued.net> +Signed-off-by: Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org> --- arch/x86/Kconfig | 2 + arch/x86/include/asm/olpc_ofw.h | 4 + @@ -106,8 +106,8 @@ index 0000000..fb04d8a + * Adapted for 64bit PowerPC by Dave Engebretsen and Peter Bergner. + * {engebret|bergner}@us.ibm.com + * -+ * Adapted for sparc by David S. Miller davem@davemloft.net -+ * Adapted for x86/OLPC by Andres Salomon <dilinger@queued.net> ++ * Adapted for sparc by David S. Miller davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org ++ * Adapted for x86/OLPC by Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -128,10 +128,10 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node }; + void *res[] = { &node }; + -+ if (node = -1) ++ if (node == -1) + return 0; + -+ if (olpc_ofw("peer", args, res) || node = -1) ++ if (olpc_ofw("peer", args, res) || node == -1) + return 0; + + return node; @@ -142,10 +142,10 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node }; + void *res[] = { &node }; + -+ if (node = -1) ++ if (node == -1) + return 0; + -+ if (olpc_ofw("child", args, res) || node = -1) { ++ if (olpc_ofw("child", args, res) || node == -1) { + pr_err("PROM: %s: fetching child failed!\n", __func__); + return 0; + } @@ -159,7 +159,7 @@ index 0000000..fb04d8a + int len; + void *res[] = { &len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("getproplen", args, res)) { @@ -199,7 +199,7 @@ index 0000000..fb04d8a + + buf[0] = '\0'; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("nextprop", args, res) || success != 1) @@ -214,7 +214,7 @@ index 0000000..fb04d8a + const void *args[] = { (void *)node, buf, (void *)buflen }; + void *res[] = { len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("package-to-path", args, res) || *len < 1) @@ -282,7 +282,7 @@ index d9396a4..9779039 100644 + of_pdt_init_devicetree(); + proc_device_tree = proc_mkdir("device-tree", NULL); - if (proc_device_tree = NULL) + if (proc_device_tree == NULL) return; diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h index 9945e58..b4bd0ee 100644 diff --git a/a/content_digest b/N2/content_digest index c354c64..60288dc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\020100628215407.2017bf2f@debian\0" "ref\020100829235100.6dcedcb8@debxo\0" - "From\0Andres Salomon <dilinger@queued.net>\0" + "From\0Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\0" "Subject\0[PATCH 9/9] x86: OLPC: add OLPC device-tree support\0" - "Date\0Mon, 30 Aug 2010 04:07:51 +0000\0" + "Date\0Mon, 30 Aug 2010 00:07:51 -0400\0" "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" "Cc\0pgf-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org" x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org @@ -24,7 +24,7 @@ "the device tree has been built prior to the proc_root_init stuff attempting\n" "to populate /proc/device-tree.\n" "\n" - "Signed-off-by: Andres Salomon <dilinger@queued.net>\n" + "Signed-off-by: Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\n" "---\n" " arch/x86/Kconfig | 2 +\n" " arch/x86/include/asm/olpc_ofw.h | 4 +\n" @@ -124,8 +124,8 @@ "+ * Adapted for 64bit PowerPC by Dave Engebretsen and Peter Bergner.\n" "+ * {engebret|bergner}@us.ibm.com\n" "+ *\n" - "+ * Adapted for sparc by David S. Miller davem@davemloft.net\n" - "+ * Adapted for x86/OLPC by Andres Salomon <dilinger@queued.net>\n" + "+ * Adapted for sparc by David S. Miller davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\n" + "+ * Adapted for x86/OLPC by Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or\n" "+ * modify it under the terms of the GNU General Public License\n" @@ -146,10 +146,10 @@ "+\tconst void *args[] = { (void *)node };\n" "+\tvoid *res[] = { &node };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn 0;\n" "+\n" - "+\tif (olpc_ofw(\"peer\", args, res) || node = -1)\n" + "+\tif (olpc_ofw(\"peer\", args, res) || node == -1)\n" "+\t\treturn 0;\n" "+\n" "+\treturn node;\n" @@ -160,10 +160,10 @@ "+\tconst void *args[] = { (void *)node };\n" "+\tvoid *res[] = { &node };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn 0;\n" "+\n" - "+\tif (olpc_ofw(\"child\", args, res) || node = -1) {\n" + "+\tif (olpc_ofw(\"child\", args, res) || node == -1) {\n" "+\t\tpr_err(\"PROM: %s: fetching child failed!\\n\", __func__);\n" "+\t\treturn 0;\n" "+\t}\n" @@ -177,7 +177,7 @@ "+\tint len;\n" "+\tvoid *res[] = { &len };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"getproplen\", args, res)) {\n" @@ -217,7 +217,7 @@ "+\n" "+\tbuf[0] = '\\0';\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"nextprop\", args, res) || success != 1)\n" @@ -232,7 +232,7 @@ "+\tconst void *args[] = { (void *)node, buf, (void *)buflen };\n" "+\tvoid *res[] = { len };\n" "+\n" - "+\tif (node = -1)\n" + "+\tif (node == -1)\n" "+\t\treturn -1;\n" "+\n" "+\tif (olpc_ofw(\"package-to-path\", args, res) || *len < 1)\n" @@ -300,7 +300,7 @@ "+\t\tof_pdt_init_devicetree();\n" "+\n" " \tproc_device_tree = proc_mkdir(\"device-tree\", NULL);\n" - " \tif (proc_device_tree = NULL)\n" + " \tif (proc_device_tree == NULL)\n" " \t\treturn;\n" "diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h\n" "index 9945e58..b4bd0ee 100644\n" @@ -317,4 +317,4 @@ "-- \n" 1.5.6.5 -1056364307e8b1e763b6169a52972e1613cf7dac96b67a5b1d7350e6997deb89 +c082cc4d0405e4b3a468fe636aaf1334b6fca92ebdf813cdce82c57a9b54a13a
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.