Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
