Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Mon, 23 May 2022 14:24:31 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Josh Poimboeuf <jpoimboe@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Subject: linux-next: manual merge of the tip tree with the kbuild tree
Message-ID: <20220523142431.10ff2f77@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/eB6BtpQ0AHS=obKOXHznCjx";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/eB6BtpQ0AHS=obKOXHznCjx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/eB6BtpQ0AHS=obKOXHznCjx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKLDH8ACgkQAVBC80lX
0GwdTAf/c6FzAJfisb6g7dTTTyHS/8MuDFYYhhSiHl9naP8p8QU+GyZMzUSFU7Ru
sYGotjAHR3V8h/zG4ogT3KN7NLTcFMdS7Iy1BE3QMNZ4YeyUOk6WcdZmnBoWFq3s
nBd7JfANZCe5clge10zqcRBKS49vrggFYqEeyBvNZn4JFxMdgRqvToOdykUegOXq
8gR/ynGFnYXjl0vkwyTmXTxaKrlJYn2U/2h1oFXbOqci9Tbme54y1UlYXM9lOWRt
0RLGXHQ0RffU7HH/PE3V99AkUaeFTQefYazE3n8lgH0wq+DbSxYoEX30C+aLL0N1
+nC4n0GG9aVs6/3JkS76RxyjkUXquw==
=sdy5
-----END PGP SIGNATURE-----

--Sig_/eB6BtpQ0AHS=obKOXHznCjx--