linux-kernel - Re: linux-next: manual merge of the selinux tree with Linus' 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] [day] [month] [year] [list]

Message-ID: <CAHC9VhSj1KbidMU4is6Y3dyvJbFCZ-woxKbPGAYmJYZFPnYxvA@mail.gmail.com>
Date:   Mon, 5 Jun 2023 16:47:58 -0400
From:   Paul Moore <paul@...l-moore.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree

On Sun, Jun 4, 2023 at 8:52 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
>   security/selinux/Makefile
>
> between commit:
>
>   42c4e97e06a8 ("selinux: don't use make's grouped targets feature yet")
>
> from Linus' tree and commits:
>
>   6f933aa7dfd0 ("selinux: more Makefile tweaks")
>   ec4a491d180b ("selinux: fix Makefile for versions of make < v4.3")
>
> from the selinux tree.
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Hi Stephen,

I had to do pretty much the same thing, and yes, simply taking the
code in the last patch is the right thing to do.

-- 
paul-moore.com