All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree
Date: Wed, 9 Mar 2016 08:22:44 +1100	[thread overview]
Message-ID: <20160309082244.621bb27c@canb.auug.org.au> (raw)
In-Reply-To: <13171.1457455687@warthog.procyon.org.uk>

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

  reply	other threads:[~2016-03-08 21:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-07  2:18 linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell
2016-03-07  2:18 ` Stephen Rothwell
2016-03-07 11:08 ` David Howells
2016-03-08  5:56   ` Stephen Rothwell
2016-03-08 16:48   ` David Howells
2016-03-08 21:22     ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-30  0:42 Stephen Rothwell
2020-03-30  0:49 ` Herbert Xu
2020-03-30 15:35   ` Ayush Sawal
2018-07-30  3:22 Stephen Rothwell
2018-07-31  6:24 ` Krzysztof Kozlowski
2018-08-15  3:12 ` Stephen Rothwell
2018-01-25 10:52 Stephen Rothwell
2013-02-06  2:20 Stephen Rothwell
2013-02-06  2:20 ` Stephen Rothwell
2013-02-06  2:20 ` Stephen Rothwell
2013-02-06  5:45 ` Herbert Xu
2013-02-06  5:45   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160309082244.621bb27c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=dhowells@redhat.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.