Re: linux-next: manual merge of the crypto tree with the net-next tree

From: David Howells
Date: Tue Mar 08 2016 - 11:48:21 EST

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 might be worth a mention in the respective pull
> requests.

Do you mean I should take it - or just let Linus merge it?

I tried to apply the rxrpc skcipher patch to net-next, but
skcipher_request_zero() isn't available there or in any of the patches in the