lkml.org 
[lkml]   [2016]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the crypto tree with the net-next tree
Date
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?

David

\
 
 \ /
  Last update: 2016-03-07 12:41    [W:0.072 / U:0.372 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site