diff for duplicates of <20100311180532.4824.64755.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index ef18880..68a60cb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ .node is being removed -Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> +Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- drivers/serial/apbuart.c | 2 +- diff --git a/a/content_digest b/N1/content_digest index 34bbf64..e27b183 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,34 @@ "ref\020100311174830.4824.19820.stgit@angua\0" - "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 19/37] drivers/serial: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:05:33 -0700\0" - "To\0monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org" - gregkh-l3A5Bk7waGM@public.gmane.org - benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org - akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org - davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org - sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org - jgarzik-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org - ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org - " dwmw2@infrade\0" + "To\0monstr@monstr.eu" + gregkh@suse.de + benh@kernel.crashing.org + akpm@linux-foundation.org + davem@davemloft.net + sfr@canb.auug.org.au + jgarzik@pobox.com + ben-linux@fluff.org + dwmw2@infradead.org + jeremy.kerr@canonical.com + James.Bottomley@suse.de + broonie@opensource.wolfsonmicro.com + microblaze-uclinux@itee.uq.edu.au + linux-kernel@vger.kernel.org + linuxppc-dev@ozlabs.org + sparclinux@vger.kernel.org + linux-ide@vger.kernel.org + netdev@vger.kernel.org + linux-i2c@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + linux-scsi@vger.kernel.org + " alsa-devel@alsa-project.org\0" "\00:1\0" "b\0" ".node is being removed\n" "\n" - "Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" + "Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" "---\n" "\n" " drivers/serial/apbuart.c | 2 +-\n" @@ -127,4 +140,4 @@ " \t\t\t\t&sunsab_reg, up[1].port.line,\n" " \t\t\t\tfalse);" -cba77a5f0506cca7d83b43c1c01024325068f9331dbbb8f15113109182d576bb +12cb68fb0ce3bbf80ec4d29e22941c635454d38b8888397d939a4352fefa0b7c
diff --git a/a/1.txt b/N2/1.txt index ef18880..89cae7c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ .node is being removed -Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> +Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- drivers/serial/apbuart.c | 2 +- @@ -19,8 +19,8 @@ index fe91319..52015d7 100644 i = 0; for (i = 0; i < grlib_apbuart_port_nr; i++) { -- if (op->node == grlib_apbuart_nodes[i]) -+ if (op->dev.of_node == grlib_apbuart_nodes[i]) +- if (op->node = grlib_apbuart_nodes[i]) ++ if (op->dev.of_node = grlib_apbuart_nodes[i]) break; } @@ -34,7 +34,7 @@ index e1ab8ec..3c02fa9 100644 - dn = to_of_device(port->dev)->node; + dn = to_of_device(port->dev)->dev.of_node; - if (dn == NULL) + if (dn = NULL) goto out; diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c @@ -67,8 +67,8 @@ index f020de1..8abbbb3 100644 /* Iterate the pmz_ports array to find a matching entry */ for (i = 0; i < MAX_ZS_PORTS; i++) -- if (pmz_ports[i].node == mdev->ofdev.node) { -+ if (pmz_ports[i].node == mdev->ofdev.dev.of_node) { +- if (pmz_ports[i].node = mdev->ofdev.node) { ++ if (pmz_ports[i].node = mdev->ofdev.dev.of_node) { struct uart_pmac_port *uap = &pmz_ports[i]; uap->dev = mdev; diff --git a/a/content_digest b/N2/content_digest index 34bbf64..3122449 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020100311174830.4824.19820.stgit@angua\0" - "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" - "Subject\0[PATCH 19/37] drivers/serial: use .dev.of_node instead of .node in struct of_device\0" - "Date\0Thu, 11 Mar 2010 11:05:33 -0700\0" + "From\0Grant Likely <grant.likely@secretlab.ca>\0" + "Subject\0[PATCH 19/37] drivers/serial: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:05:33 +0000\0" "To\0monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org" gregkh-l3A5Bk7waGM@public.gmane.org benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org @@ -15,7 +15,7 @@ "b\0" ".node is being removed\n" "\n" - "Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" + "Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" "---\n" "\n" " drivers/serial/apbuart.c | 2 +-\n" @@ -34,8 +34,8 @@ " \n" " \ti = 0;\n" " \tfor (i = 0; i < grlib_apbuart_port_nr; i++) {\n" - "-\t\tif (op->node == grlib_apbuart_nodes[i])\n" - "+\t\tif (op->dev.of_node == grlib_apbuart_nodes[i])\n" + "-\t\tif (op->node = grlib_apbuart_nodes[i])\n" + "+\t\tif (op->dev.of_node = grlib_apbuart_nodes[i])\n" " \t\t\tbreak;\n" " \t}\n" " \n" @@ -49,7 +49,7 @@ " \n" "-\tdn = to_of_device(port->dev)->node;\n" "+\tdn = to_of_device(port->dev)->dev.of_node;\n" - " \tif (dn == NULL)\n" + " \tif (dn = NULL)\n" " \t\tgoto out;\n" " \n" "diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c\n" @@ -82,8 +82,8 @@ " \t/* Iterate the pmz_ports array to find a matching entry\n" " \t */\n" " \tfor (i = 0; i < MAX_ZS_PORTS; i++)\n" - "-\t\tif (pmz_ports[i].node == mdev->ofdev.node) {\n" - "+\t\tif (pmz_ports[i].node == mdev->ofdev.dev.of_node) {\n" + "-\t\tif (pmz_ports[i].node = mdev->ofdev.node) {\n" + "+\t\tif (pmz_ports[i].node = mdev->ofdev.dev.of_node) {\n" " \t\t\tstruct uart_pmac_port *uap = &pmz_ports[i];\n" " \n" " \t\t\tuap->dev = mdev;\n" @@ -127,4 +127,4 @@ " \t\t\t\t&sunsab_reg, up[1].port.line,\n" " \t\t\t\tfalse);" -cba77a5f0506cca7d83b43c1c01024325068f9331dbbb8f15113109182d576bb +3e0a95ff73b696b6a4fa59f183420a72944970efd26cccc56a5b1c2fd514fde5
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.