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

From: Stephen Rothwell
Date: Tue Mar 08 2016 - 16:22:59 EST


Hi David,

On Tue, 08 Mar 2016 16:48:07 +0000 David Howells <dhowells@xxxxxxxxxx> wrote:
>
> 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?

Just leave it to Linus.

--
Cheers,
Stephen Rothwell