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:   Tue, 23 Feb 2021 10:49:50 +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: <20210223104950.1f754320@canb.auug.org.au>
In-Reply-To: <20210215074726.60c45281@canb.auug.org.au>
References: <20210118150804.378ac9f3@canb.auug.org.au>
        <20210215074726.60c45281@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_L.V5b/u7kTB1oSiHwMFBW2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/_L.V5b/u7kTB1oSiHwMFBW2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> 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 int=
o 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. =20
>=20
> With the merge window about to open, this is a reminder that this
> conflict still exists.

This is now a conflict between the kspp tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/_L.V5b/u7kTB1oSiHwMFBW2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA0Qx4ACgkQAVBC80lX
0GzvaAf/exYfZ63fFOXiiAaFP0uHEBIhRhM1t9R/hMH1ktuFdwluNFDAWb6tryej
CJt3LHk8CZTyvc4MlaZgAWW/VaGFyJKsN+EjBl5Q8oIMyn2RlazhZfLx7ZA3n1jL
d1q9xh4fK8xhKxzF0TAlsTm2QumF7b5pl7YOy6a7ISmc5qmw25UP7goVve1bHrYH
/QbYVIXBi9azya06tYhrMYd9+HlD7tq7wibcoHIDtb+uIRnIldxrEMQXmMzkYSPQ
M1gGAsLMHoy54ClkMkmvKWoaSwGsUrK9ZpkkaLomJM1ZTtJUzJcPXVZtPmIKRClc
NxoSGrm49gW3acu4n124c1w852dJVg==
=4lJh
-----END PGP SIGNATURE-----

--Sig_/_L.V5b/u7kTB1oSiHwMFBW2--