[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20160309082244.621bb27c@canb.auug.org.au>
Date: Wed, 9 Mar 2016 08:22:44 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Howells <dhowells@...hat.com>
Cc: Herbert Xu <herbert@...dor.apana.org.au>,
David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the crypto tree with the net-next
tree
Hi David,
On Tue, 08 Mar 2016 16:48:07 +0000 David Howells <dhowells@...hat.com> wrote:
>
> Stephen Rothwell <sfr@...b.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?
Just leave it to Linus.
--
Cheers,
Stephen Rothwell
Powered by blists - more mailing lists