Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Feb 2021 07:47:26 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kees Cook <keescook@chromium.org>,
        Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc:     Alexander Lobakin <alobakin@pm.me>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sami Tolvanen <samitolvanen@google.com>
Subject: Re: linux-next: manual merge of the kspp tree with the mips tree
Message-ID: <20210215074726.60c45281@canb.auug.org.au>
In-Reply-To: <20210118150804.378ac9f3@canb.auug.org.au>
References: <20210118150804.378ac9f3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nS549xQolZZpAWCMJA.39+J";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/nS549xQolZZpAWCMJA.39+J
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   include/asm-generic/vmlinux.lds.h
>=20
> between commits:
>=20
>   9a427556fb8e ("vmlinux.lds.hf41b233de0ae: catch compound literals into =
data and BSS")
>   f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data")
>=20
> from the mips tree and commit:
>=20
>   dc5723b02e52 ("kbuild: add support for Clang LTO")
>=20
> from the kspp tree.
>=20
> I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
> DATA_MAIN, which conflicted with the change in f41b233de0ae) 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.

With the merge window about to open, this is a reminder that this
conflict still exists.

--=20
Cheers,
Stephen Rothwell

--Sig_/nS549xQolZZpAWCMJA.39+J
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmApjF4ACgkQAVBC80lX
0GzWvgf/Y69q/cVrjpJd4RCXHUDA8W1MOwX3uLH0BokkbDXx1HzNlyEp+t71cSgw
LWVpkSXeQyF5iq4Nfq4Bed1Z30x+xV30izcuVIUcCdwX898fCu0XC1pE15W8HOLe
e9BIKSZl6SUN5a3KbrSozjSLYGCXrTiCbk8Ha9ME1mxMsPjVJzecdcTtI3kp2Lyl
gJOApeQqXWHsv1L+QuCTy3M79neshYPfsJt9nlZ0kk50Hga9owZX4E4Uxn62fHu6
q1GgrjvmHTAGt5B6Els5LxeWMBMVIn1M5MBZqK4r19mSqYAOrGp1z7in9kYRocje
3SndlImvhMFHAIhQxIyMPM1fSbZy2A==
=bekH
-----END PGP SIGNATURE-----

--Sig_/nS549xQolZZpAWCMJA.39+J--