diff for duplicates of <20101010020626.102437f5@debxo> diff --git a/a/1.txt b/N1/1.txt index 9583eee..6989357 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -124,10 +124,10 @@ index 0000000..e2ecaf2 + 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; @@ -138,10 +138,10 @@ index 0000000..e2ecaf2 + 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; + } @@ -155,7 +155,7 @@ index 0000000..e2ecaf2 + int len; + void *res[] = { &len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("getproplen", args, res)) { @@ -195,7 +195,7 @@ index 0000000..e2ecaf2 + + buf[0] = '\0'; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("nextprop", args, res) || success != 1) @@ -210,7 +210,7 @@ index 0000000..e2ecaf2 + 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) @@ -278,7 +278,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 c65a18a..5b29aef 100644 diff --git a/a/content_digest b/N1/content_digest index 9211a5f..b51a5cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "From\0Andres Salomon <dilinger@queued.net>\0" "Subject\0[PATCH 5/5] x86: OLPC: add OLPC device-tree support\0" - "Date\0Sun, 10 Oct 2010 09:06:26 +0000\0" - "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" - "Cc\0sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org - David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Date\0Sun, 10 Oct 2010 02:06:26 -0700\0" + "To\0Grant Likely <grant.likely@secretlab.ca>\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + David Miller <davem@davemloft.net> + sparclinux@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -134,10 +134,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" @@ -148,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(\"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" @@ -165,7 +165,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" @@ -205,7 +205,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" @@ -220,7 +220,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" @@ -288,7 +288,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 c65a18a..5b29aef 100644\n" @@ -305,4 +305,4 @@ "-- \n" 1.5.6.5 -c8d628532d1df8df08f4c6ad9d0e235d71f03f7ce19f1add3e388d42802c0cb2 +c22f365c3320aa7c5d81d5bbc22a448fffa804eb7cce4dc65788cb91782b927e
diff --git a/a/1.txt b/N2/1.txt index 9583eee..ac7cd07 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ Make use of PROC_DEVICETREE to export the tree, and sparc's PROMTREE code to call into OLPC's Open Firmware to build the 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 + @@ -102,8 +102,8 @@ index 0000000..e2ecaf2 + * 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 @@ -124,10 +124,10 @@ index 0000000..e2ecaf2 + 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; @@ -138,10 +138,10 @@ index 0000000..e2ecaf2 + 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; + } @@ -155,7 +155,7 @@ index 0000000..e2ecaf2 + int len; + void *res[] = { &len }; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("getproplen", args, res)) { @@ -195,7 +195,7 @@ index 0000000..e2ecaf2 + + buf[0] = '\0'; + -+ if (node = -1) ++ if (node == -1) + return -1; + + if (olpc_ofw("nextprop", args, res) || success != 1) @@ -210,7 +210,7 @@ index 0000000..e2ecaf2 + 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) @@ -278,7 +278,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 c65a18a..5b29aef 100644 diff --git a/a/content_digest b/N2/content_digest index 9211a5f..81807b7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ - "From\0Andres Salomon <dilinger@queued.net>\0" + "From\0Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\0" "Subject\0[PATCH 5/5] x86: OLPC: add OLPC device-tree support\0" - "Date\0Sun, 10 Oct 2010 09:06:26 +0000\0" + "Date\0Sun, 10 Oct 2010 02:06:26 -0700\0" "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" "Cc\0sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org @@ -12,7 +12,7 @@ "Make use of PROC_DEVICETREE to export the tree, and sparc's PROMTREE code to\n" "call into OLPC's Open Firmware to build the 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" @@ -112,8 +112,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" @@ -134,10 +134,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" @@ -148,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(\"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" @@ -165,7 +165,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" @@ -205,7 +205,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" @@ -220,7 +220,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" @@ -288,7 +288,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 c65a18a..5b29aef 100644\n" @@ -305,4 +305,4 @@ "-- \n" 1.5.6.5 -c8d628532d1df8df08f4c6ad9d0e235d71f03f7ce19f1add3e388d42802c0cb2 +4103a754012c62a5f619df0e87c685d58f3cef7bcb908b00cc55b848b6baacca
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.