diff for duplicates of <52CDBBE1.1010301@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 82f9c63..a924e25 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -118,7 +118,7 @@ like you've also missed to set 'hw_crc' field since this SoC has CSMR... > } [...] > @@ -1062,7 +1155,8 @@ static void sh_eth_ring_format(struct net_device *ndev) -> if (i = 0) { +> if (i == 0) { > /* Tx descriptor address set */ > sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR); > - if (sh_eth_is_gether(mdp)) diff --git a/a/content_digest b/N1/content_digest index fa9ed85..c49fed4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01389168152-9434-1-git-send-email-horms+renesas@verge.net.au\0" "ref\01389168152-9434-3-git-send-email-horms+renesas@verge.net.au\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH v4 net-next 2/4] sh_eth: Add support for r7s72100\0" - "Date\0Wed, 08 Jan 2014 19:58:11 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH v4 net-next 2/4] sh_eth: Add support for r7s72100\0" + "Date\0Wed, 08 Jan 2014 23:58:09 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -126,7 +126,7 @@ "> }\n" "[...]\n" "> @@ -1062,7 +1155,8 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" - "> \t\tif (i = 0) {\n" + "> \t\tif (i == 0) {\n" "> \t\t\t/* Tx descriptor address set */\n" "> \t\t\tsh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);\n" "> -\t\t\tif (sh_eth_is_gether(mdp))\n" @@ -193,4 +193,4 @@ "\n" WBR, Sergei -7e6f2aa7e1f602b7e66ffe894bf5f370d28fd26137f09368775e7118f280a4b8 +40659533547a6ebf9a9b8eb4d90a93bb7ac96bd619e24bf3c2bd6d157d73d8e0
diff --git a/a/1.txt b/N2/1.txt index 82f9c63..a924e25 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -118,7 +118,7 @@ like you've also missed to set 'hw_crc' field since this SoC has CSMR... > } [...] > @@ -1062,7 +1155,8 @@ static void sh_eth_ring_format(struct net_device *ndev) -> if (i = 0) { +> if (i == 0) { > /* Tx descriptor address set */ > sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR); > - if (sh_eth_is_gether(mdp)) diff --git a/a/content_digest b/N2/content_digest index fa9ed85..167ae3e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,13 @@ "ref\01389168152-9434-3-git-send-email-horms+renesas@verge.net.au\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH v4 net-next 2/4] sh_eth: Add support for r7s72100\0" - "Date\0Wed, 08 Jan 2014 19:58:11 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 08 Jan 2014 23:58:09 +0300\0" + "To\0Simon Horman <horms+renesas@verge.net.au>" + David S. Miller <davem@davemloft.net> + netdev@vger.kernel.org + " linux-sh@vger.kernel.org\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "On 01/08/2014 11:02 AM, Simon Horman wrote:\n" @@ -126,7 +131,7 @@ "> }\n" "[...]\n" "> @@ -1062,7 +1155,8 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" - "> \t\tif (i = 0) {\n" + "> \t\tif (i == 0) {\n" "> \t\t\t/* Tx descriptor address set */\n" "> \t\t\tsh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);\n" "> -\t\t\tif (sh_eth_is_gether(mdp))\n" @@ -193,4 +198,4 @@ "\n" WBR, Sergei -7e6f2aa7e1f602b7e66ffe894bf5f370d28fd26137f09368775e7118f280a4b8 +773ea663660f8258f952df6941cdec9cd5386aa7f3e8544da95eb77456d1f12a
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.