Messages in this thread | | | From | David Howells <> | Subject | Re: linux-next: manual merge of the crypto tree with the net-next tree | Date | Tue, 08 Mar 2016 16:48:07 +0000 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> 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 series.
David
| |