diff for duplicates of <1259207655.16367.220.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 9f1c130..30ed9a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,11 +43,11 @@ Ben. > - return 0; > - > - prop = of_get_flat_dt_prop(node, "#size-cells", NULL); -> - dt_root_size_cells = (prop == NULL) ? 1 : *prop; +> - dt_root_size_cells = (prop = NULL) ? 1 : *prop; > - pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); > - > - prop = of_get_flat_dt_prop(node, "#address-cells", NULL); -> - dt_root_addr_cells = (prop == NULL) ? 2 : *prop; +> - dt_root_addr_cells = (prop = NULL) ? 2 : *prop; > - pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); > - > - /* break now */ @@ -85,11 +85,11 @@ Ben. > - return 0; > - > - prop = of_get_flat_dt_prop(node, "#size-cells", NULL); -> - dt_root_size_cells = (prop == NULL) ? 1 : *prop; +> - dt_root_size_cells = (prop = NULL) ? 1 : *prop; > - DBG("dt_root_size_cells = %x\n", dt_root_size_cells); > - > - prop = of_get_flat_dt_prop(node, "#address-cells", NULL); -> - dt_root_addr_cells = (prop == NULL) ? 2 : *prop; +> - dt_root_addr_cells = (prop = NULL) ? 2 : *prop; > - DBG("dt_root_addr_cells = %x\n", dt_root_addr_cells); > - > - /* break now */ @@ -128,11 +128,11 @@ Ben. > + return 0; > + > + prop = of_get_flat_dt_prop(node, "#size-cells", NULL); -> + dt_root_size_cells = (prop == NULL) ? 1 : *prop; +> + dt_root_size_cells = (prop = NULL) ? 1 : *prop; > + pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); > + > + prop = of_get_flat_dt_prop(node, "#address-cells", NULL); -> + dt_root_addr_cells = (prop == NULL) ? 2 : *prop; +> + dt_root_addr_cells = (prop = NULL) ? 2 : *prop; > + pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); > + > + /* break now */ diff --git a/a/content_digest b/N1/content_digest index 7f3dcb7..6681cb3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,14 @@ "ref\020091124081800.6216.27311.stgit@angua\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 02/11] of/flattree: Merge earlyinit_dt_scan_root()\0" - "Date\0Thu, 26 Nov 2009 14:54:15 +1100\0" - "To\0Grant Likely <grant.likely@secretlab.ca>\0" - "Cc\0sfr@canb.auug.org.au" - monstr@monstr.eu - microblaze-uclinux@itee.uq.edu.au - devicetree-discuss@lists.ozlabs.org - sparclinux@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - " davem@davemloft.net\0" + "Date\0Thu, 26 Nov 2009 03:54:15 +0000\0" + "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "Cc\0sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org" + microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" "\00:1\0" "b\0" "On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote:\n" @@ -58,11 +57,11 @@ "> -\t\treturn 0;\n" "> -\n" "> -\tprop = of_get_flat_dt_prop(node, \"#size-cells\", NULL);\n" - "> -\tdt_root_size_cells = (prop == NULL) ? 1 : *prop;\n" + "> -\tdt_root_size_cells = (prop = NULL) ? 1 : *prop;\n" "> -\tpr_debug(\"dt_root_size_cells = %x\\n\", dt_root_size_cells);\n" "> -\n" "> -\tprop = of_get_flat_dt_prop(node, \"#address-cells\", NULL);\n" - "> -\tdt_root_addr_cells = (prop == NULL) ? 2 : *prop;\n" + "> -\tdt_root_addr_cells = (prop = NULL) ? 2 : *prop;\n" "> -\tpr_debug(\"dt_root_addr_cells = %x\\n\", dt_root_addr_cells);\n" "> -\n" "> -\t/* break now */\n" @@ -100,11 +99,11 @@ "> -\t\treturn 0;\n" "> -\n" "> -\tprop = of_get_flat_dt_prop(node, \"#size-cells\", NULL);\n" - "> -\tdt_root_size_cells = (prop == NULL) ? 1 : *prop;\n" + "> -\tdt_root_size_cells = (prop = NULL) ? 1 : *prop;\n" "> -\tDBG(\"dt_root_size_cells = %x\\n\", dt_root_size_cells);\n" "> -\n" "> -\tprop = of_get_flat_dt_prop(node, \"#address-cells\", NULL);\n" - "> -\tdt_root_addr_cells = (prop == NULL) ? 2 : *prop;\n" + "> -\tdt_root_addr_cells = (prop = NULL) ? 2 : *prop;\n" "> -\tDBG(\"dt_root_addr_cells = %x\\n\", dt_root_addr_cells);\n" "> -\t\n" "> -\t/* break now */\n" @@ -143,11 +142,11 @@ "> +\t\treturn 0;\n" "> +\n" "> +\tprop = of_get_flat_dt_prop(node, \"#size-cells\", NULL);\n" - "> +\tdt_root_size_cells = (prop == NULL) ? 1 : *prop;\n" + "> +\tdt_root_size_cells = (prop = NULL) ? 1 : *prop;\n" "> +\tpr_debug(\"dt_root_size_cells = %x\\n\", dt_root_size_cells);\n" "> +\n" "> +\tprop = of_get_flat_dt_prop(node, \"#address-cells\", NULL);\n" - "> +\tdt_root_addr_cells = (prop == NULL) ? 2 : *prop;\n" + "> +\tdt_root_addr_cells = (prop = NULL) ? 2 : *prop;\n" "> +\tpr_debug(\"dt_root_addr_cells = %x\\n\", dt_root_addr_cells);\n" "> +\n" "> +\t/* break now */\n" @@ -183,4 +182,4 @@ "> extern void finish_device_tree(void);\n" > extern void unflatten_device_tree(void); -c6da92913ee4e64c6b01b0d59a7fcc51889a7792436d35134f523d1f928bab0f +31163e3c0502404d87b69a74ed2e5b6d0f6b15290813a13072a1e42faa910060
diff --git a/a/1.txt b/N2/1.txt index 9f1c130..dad2a07 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote: > Merge common code between PowerPC and Microblaze > -> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> > --- Ok with that, like the precendent, however you are making global some diff --git a/a/content_digest b/N2/content_digest index 7f3dcb7..26e63af 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,21 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "ref\020091124081800.6216.27311.stgit@angua\0" - "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" + "From\0Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>\0" "Subject\0Re: [PATCH 02/11] of/flattree: Merge earlyinit_dt_scan_root()\0" "Date\0Thu, 26 Nov 2009 14:54:15 +1100\0" - "To\0Grant Likely <grant.likely@secretlab.ca>\0" - "Cc\0sfr@canb.auug.org.au" - monstr@monstr.eu - microblaze-uclinux@itee.uq.edu.au - devicetree-discuss@lists.ozlabs.org - sparclinux@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - " davem@davemloft.net\0" + "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "Cc\0sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org" + microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" "\00:1\0" "b\0" "On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote:\n" "> Merge common code between PowerPC and Microblaze\n" "> \n" - "> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" + "> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" "> ---\n" "\n" "Ok with that, like the precendent, however you are making global some\n" @@ -183,4 +182,4 @@ "> extern void finish_device_tree(void);\n" > extern void unflatten_device_tree(void); -c6da92913ee4e64c6b01b0d59a7fcc51889a7792436d35134f523d1f928bab0f +f774664930405f3a275e2c55d8518e69b1baee7883c25a844f9906668f46344e
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.