lkml.org 
[lkml]   [2018]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the selinux tree with the net-next tree
From
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.

\
 
 \ /
  Last update: 2018-03-07 21:26    [W:0.061 / U:2.332 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site