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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the crypto tree with the net-next tree
Date	2016-03-08 22:30 +0100
Message-ID	<raxmx-6ye-13@gated-at.bofh.it> (permalink)
References	<raiQz-55u-17@gated-at.bofh.it> <r9SW5-4YY-1@gated-at.bofh.it> <ra1d0-24s-15@gated-at.bofh.it> <rasZA-3on-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi David,

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

Just leave it to Linus.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-07 03:20 +0100
  Re: linux-next: manual merge of the crypto tree with the net-next tree David Howells <dhowells@redhat.com> - 2016-03-07 12:10 +0100
    Re: linux-next: manual merge of the crypto tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-08 07:00 +0100
      Re: linux-next: manual merge of the crypto tree with the net-next tree David Howells <dhowells@redhat.com> - 2016-03-08 17:50 +0100
        Re: linux-next: manual merge of the crypto tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-08 22:30 +0100

csiph-web