All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: paul@paul-moore.com
Cc: lucien.xin@gmail.com, sfr@canb.auug.org.au,
	netdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, richard_c_haines@btinternet.com
Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree
Date: Wed, 07 Mar 2018 15:26:16 -0500 (EST)	[thread overview]
Message-ID: <20180307.152616.19450694775691873.davem@davemloft.net> (raw)
In-Reply-To: <CAHC9VhRQb50EYD6BVTxNv2x=S_tTLq57OZBsWbXFdfJEunNUiA@mail.gmail.com>

From: Paul Moore <paul@paul-moore.com>
Date: Wed, 7 Mar 2018 15:20:33 -0500

>> So you would only have to wait until my tree went in before
>> sending your pull request.
> 
> So you would want me to rebase selinux/next on top of Linus' tree in
> the middle of the merge window?  I'm sure that isn't what you meant,
> but that's how I keep reading the above ... which can't be right,
> because in my experience that's one way to piss off Linus.  Help me
> understand what you are saying.

I never said you rebase anything.  I wonder where you get that from.

I'm saying, you just defer your pull request until Linus takes my
networking tree in.

No changes or rebasing of your tree is necessary whatsoever.  You just
ask him to pull your tree as-is.

Again, this is what other smaller subsystem trees do when they have a
situation like this.

  parent reply	other threads:[~2018-03-07 20:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-05  1:40 linux-next: manual merge of the selinux tree with the net-next tree Stephen Rothwell
2018-03-05  7:03 ` Xin Long
2018-03-07 16:34   ` Paul Moore
2018-03-07 16:41     ` David Miller
2018-03-07 17:27       ` Paul Moore
2018-03-07 17:45         ` David Miller
2018-03-07 20:20           ` Paul Moore
2018-03-07 20:24             ` David Miller
2018-03-07 20:26             ` David Miller [this message]
2018-03-07 23:28               ` Paul Moore
2018-03-08  2:07 ` Stephen Rothwell
2018-03-08 13:00   ` Paul Moore
2018-03-08 13:12     ` Xin Long
2018-03-08 13:29   ` Xin Long
2018-03-09 12:52   ` Marcelo Ricardo Leitner
  -- strict thread matches above, loose matches on Subject: below --
2012-01-05  4:12 Stephen Rothwell
2012-01-05  4:12 ` Stephen Rothwell
2012-01-05 21:25 ` Paul Moore
2012-01-05 22:15   ` Stephen Rothwell
2012-01-05 22:51     ` Eric Paris

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=20180307.152616.19450694775691873.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lucien.xin@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=richard_c_haines@btinternet.com \
    --cc=sfr@canb.auug.org.au \
    /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.