linux-kernel.vger.kernel.org archive mirror
 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 12:45:00 -0500 (EST)	[thread overview]
Message-ID: <20180307.124500.1863183408172828694.davem@davemloft.net> (raw)
In-Reply-To: <CAHC9VhTUORhy1dADEza8tr4DW6gTjqxXyg0wb0cwFCRy+WRkMQ@mail.gmail.com>

From: Paul Moore <paul@paul-moore.com>
Date: Wed, 7 Mar 2018 12:27:52 -0500

> I'm not sure we could have cleanly separated the core network stack
> changes from the rest of the SELinux/SCTP enablement, regardless it's
> a bit late at this point.  The only other thought would have been to
> simply push Xin Long's cleanup patches until after the next merge
> window, but that would only be worth considering if they truly were
> just cleanup patches, and even then it doesn't seem very fair to Xin
> Long to have to wait.

I think you wanted to have more integration, rather than less.

What others have done in the past, is they simply pull my networking
tree into their's.

I never rebase, ever.

My tree often goes in reasonable early in the merge window.

So you would only have to wait until my tree went in before
sending your pull request.

That's really the way to handle something like this.

  reply	other threads:[~2018-03-07 17:45 UTC|newest]

Thread overview: 19+ 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 [this message]
2018-03-07 20:20           ` Paul Moore
2018-03-07 20:24             ` David Miller
2018-03-07 20:26             ` David Miller
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 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.124500.1863183408172828694.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).