diff for duplicates of <1454019259.2332.17.camel@sipsolutions.net> diff --git a/a/1.txt b/N1/1.txt index 7f165d3..727de91 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,8 @@ On Thu, 2016-01-28 at 23:02 +0100, Arnd Bergmann wrote: > On Thursday 28 January 2016 14:25:32 Troy Kisky wrote: > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> > > --- -> > ?drivers/net/ethernet/freescale/fec_main.c | 4 ++-- -> > ?1 file changed, 2 insertions(+), 2 deletions(-) +> > drivers/net/ethernet/freescale/fec_main.c | 4 ++-- +> > 1 file changed, 2 insertions(+), 2 deletions(-) > > [note: missing changelog?] > @@ -14,25 +14,25 @@ On Thu, 2016-01-28 at 23:02 +0100, Arnd Bergmann wrote: > > +++ b/drivers/net/ethernet/freescale/fec_main.c > > @@ -476,6 +476,8 @@ static int fec_enet_txq_submit_skb(struct > > fec_enet_priv_tx_q *txq, -> > ? estatus |= BD_ENET_TX_TS; -> > ? } -> > ? } +> > estatus |= BD_ENET_TX_TS; +> > } +> > } > > + bdp->cbd_bufaddr = addr; > > + bdp->cbd_datlen = buflen; -> > ? -> > ? if (fep->bufdesc_ex) { -> > ? +> > +> > if (fep->bufdesc_ex) { +> > > > @@ -499,8 +501,6 @@ static int fec_enet_txq_submit_skb(struct > > fec_enet_priv_tx_q *txq, -> > ? /* Save skb pointer */ -> > ? txq->tx_skbuff[index] = skb; -> > ? +> > /* Save skb pointer */ +> > txq->tx_skbuff[index] = skb; +> > > > - bdp->cbd_datlen = buflen; > > - bdp->cbd_bufaddr = addr; -> > ? /* Make sure the updates to rest of the descriptor are +> > /* Make sure the updates to rest of the descriptor are > > performed before -> > ? ?* transferring ownership. -> > ? ?*/ +> > * transferring ownership. +> > */ > > > > This patch and others in the series conflicts with the bugfix "net: diff --git a/a/content_digest b/N1/content_digest index 6849f6c..4d00d10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,30 @@ "ref\01454016364-30985-1-git-send-email-troy.kisky@boundarydevices.com\0" "ref\01454016364-30985-9-git-send-email-troy.kisky@boundarydevices.com\0" "ref\01725152.bhtFKTSjnb@wuerfel\0" - "From\0johannes@sipsolutions.net (Johannes Berg)\0" - "Subject\0[PATCH net-next 08/40] net: fec: move cbd_bufaddr assignment closer to the mapping function\0" + "From\0Johannes Berg <johannes@sipsolutions.net>\0" + "Subject\0Re: [PATCH net-next 08/40] net: fec: move cbd_bufaddr assignment closer to the mapping function\0" "Date\0Thu, 28 Jan 2016 23:14:19 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Troy Kisky <troy.kisky@boundarydevices.com>" + netdev@vger.kernel.org + davem@davemloft.net + B38611@freescale.com + fabio.estevam@freescale.com + andrew@lunn.ch + linux@arm.linux.org.uk + laci@boundarydevices.com + l.stach@pengutronix.de + shawnguo@kernel.org + " tremyfr@gmail.com\0" "\00:1\0" "b\0" "On Thu, 2016-01-28 at 23:02 +0100, Arnd Bergmann wrote:\n" "> On Thursday 28 January 2016 14:25:32 Troy Kisky wrote:\n" "> > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>\n" "> > ---\n" - "> > ?drivers/net/ethernet/freescale/fec_main.c | 4 ++--\n" - "> > ?1 file changed, 2 insertions(+), 2 deletions(-)\n" + "> > \302\240drivers/net/ethernet/freescale/fec_main.c | 4 ++--\n" + "> > \302\2401 file changed, 2 insertions(+), 2 deletions(-)\n" "> \n" "> [note: missing changelog?]\n" "> \n" @@ -23,25 +35,25 @@ "> > +++ b/drivers/net/ethernet/freescale/fec_main.c\n" "> > @@ -476,6 +476,8 @@ static int fec_enet_txq_submit_skb(struct\n" "> > fec_enet_priv_tx_q *txq,\n" - "> > ?\t\t\t\testatus |= BD_ENET_TX_TS;\n" - "> > ?\t\t}\n" - "> > ?\t}\n" + "> > \302\240\t\t\t\testatus |= BD_ENET_TX_TS;\n" + "> > \302\240\t\t}\n" + "> > \302\240\t}\n" "> > +\tbdp->cbd_bufaddr = addr;\n" "> > +\tbdp->cbd_datlen = buflen;\n" - "> > ?\n" - "> > ?\tif (fep->bufdesc_ex) {\n" - "> > ?\n" + "> > \302\240\n" + "> > \302\240\tif (fep->bufdesc_ex) {\n" + "> > \302\240\n" "> > @@ -499,8 +501,6 @@ static int fec_enet_txq_submit_skb(struct\n" "> > fec_enet_priv_tx_q *txq,\n" - "> > ?\t/* Save skb pointer */\n" - "> > ?\ttxq->tx_skbuff[index] = skb;\n" - "> > ?\n" + "> > \302\240\t/* Save skb pointer */\n" + "> > \302\240\ttxq->tx_skbuff[index] = skb;\n" + "> > \302\240\n" "> > -\tbdp->cbd_datlen = buflen;\n" "> > -\tbdp->cbd_bufaddr = addr;\n" - "> > ?\t/* Make sure the updates to rest of the descriptor are\n" + "> > \302\240\t/* Make sure the updates to rest of the descriptor are\n" "> > performed before\n" - "> > ?\t?* transferring ownership.\n" - "> > ?\t?*/\n" + "> > \302\240\t\302\240* transferring ownership.\n" + "> > \302\240\t\302\240*/\n" "> > \n" "> \n" "> This patch and others in the series conflicts with the bugfix \"net:\n" @@ -56,4 +68,4 @@ "\n" johannes -be3bbcc9ef0049393f2a44cae9f4020f548749140ce96467e9920aa826a9e96c +0782379f4a8eb12d79e41ee4097cb60d6a8d0583e1e4ad673acedbe5b5be86b8
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.