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

Message-ID: <20220523142431.10ff2f77@canb.auug.org.au>
Date:   Mon, 23 May 2022 14:24:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     Josh Poimboeuf <jpoimboe@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Subject: linux-next: manual merge of the tip tree with the kbuild tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  scripts/Makefile.build

between commit:

  0212301af7bb ("kbuild: do not create *.prelink.o for Clang LTO or IBT")

from the kbuild tree and commit:

  753da4179d08 ("objtool: Remove --lto and --vmlinux in favor of --link")

from the tip tree.

I am not sure if I fixed this up correctly, please check the final result
when linux-next is released.

I fixed it up (I used the former 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped