Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
between commit:
9d5fd927d20b ("cxgb4/cxgb4vf: add support for ndo_set_vf_vlan")
from the net-next tree and commit:
a6ec572bfa7d ("cxgb4: Add support for Inline IPSec Tx"
Hi David,
On Tue, 08 Mar 2016 16:48:07 + David Howells wrote:
>
> Stephen Rothwell wrote:
>
> > > What's the best way to deal with this? Should I take Herbert's
> > >
> > > [PATCH 18/26] rxrpc: Use skcipher
> > >
> > > patch into my rxrpc tree also and pass it on to Dave?
> >
> > Li
Stephen Rothwell wrote:
> > What's the best way to deal with this? Should I take Herbert's
> >
> > [PATCH 18/26] rxrpc: Use skcipher
> >
> > patch into my rxrpc tree also and pass it on to Dave?
>
> Linus can deal with it when he merges the latter of the crypto or
> net-next trees. It mi
Hi David,
On Mon, 07 Mar 2016 11:08:25 + David Howells wrote:
>
> Stephen Rothwell wrote:
>
> > Today's linux-next merge of the crypto tree got a conflict in:
> >
> > net/rxrpc/rxkad.c
> >
> > between commit:
> >
> > 0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header
Stephen Rothwell wrote:
> Today's linux-next merge of the crypto tree got a conflict in:
>
> net/rxrpc/rxkad.c
>
> between commit:
>
> 0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header in host
> byte order")
>
> from the net-next tree and commit:
>
> 1afe593b4239 ("rx
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
net/rxrpc/rxkad.c
between commit:
0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header in host
byte order")
from the net-next tree and commit:
1afe593b4239 ("rxrpc: Use skcipher")
from the crypto
