diff for duplicates of <20091124081800.6216.27311.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index 859a7d3..2fd9304 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,11 +36,11 @@ index 7959495..189179a 100644 - 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 */ @@ -78,11 +78,11 @@ index 1ecd6c6..78f65a4 100644 - 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 */ @@ -121,11 +121,11 @@ index 6ad98e8..be200be 100644 + 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 0520089..3dbc983 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 02/11] of/flattree: Merge earlyinit_dt_scan_root()\0" - "Date\0Tue, 24 Nov 2009 01:18:08 -0700\0" + "Date\0Tue, 24 Nov 2009 08:18:08 +0000\0" "To\0linuxppc-dev@lists.ozlabs.org" devicetree-discuss@lists.ozlabs.org sparclinux@vger.kernel.org microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "Merge common code between PowerPC and Microblaze\n" @@ -50,11 +49,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" @@ -92,11 +91,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" @@ -135,11 +134,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" @@ -175,4 +174,4 @@ " extern void finish_device_tree(void);\n" extern void unflatten_device_tree(void); -abd1d971a5e27b02fc7ce1f9d91076492deee5967aac108770d9f5ca8bd01987 +3f795647d4684d842a207412b9b10a5f5b2dea1a77b0ab64d7d7b518f48ed66d
diff --git a/a/content_digest b/N2/content_digest index 0520089..49b03ac 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,8 +8,7 @@ microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "Merge common code between PowerPC and Microblaze\n" @@ -175,4 +174,4 @@ " extern void finish_device_tree(void);\n" extern void unflatten_device_tree(void); -abd1d971a5e27b02fc7ce1f9d91076492deee5967aac108770d9f5ca8bd01987 +a828442877a8480f333bb4b4749d5616ef32fac3a3675efe477355be010f1564
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.