Messages in this thread | | | Date | Tue, 8 Mar 2016 16:56:12 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the crypto tree with the net-next tree |
| |
Hi David,
On Mon, 07 Mar 2016 11:08:25 +0000 David Howells <dhowells@redhat.com> wrote: > > Stephen Rothwell <sfr@canb.auug.org.au> 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 ("rxrpc: Use skcipher") > > > > from the crypto tree. > > 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 might be worth a mention in the respective pull requests.
-- Cheers, Stephen Rothwell
| |