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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180307.124500.1863183408172828694.davem@davemloft.net>
Date:   Wed, 07 Mar 2018 12:45:00 -0500 (EST)
From:   David Miller <davem@...emloft.net>
To:     paul@...l-moore.com
Cc:     lucien.xin@...il.com, sfr@...b.auug.org.au, netdev@...r.kernel.org,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        richard_c_haines@...nternet.com
Subject: Re: linux-next: manual merge of the selinux tree with the net-next
 tree

From: Paul Moore <paul@...l-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.