Received-SPF: pass (google.com: domain of linux-kernel+bounces-102609-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 14 Mar 2024 09:44:26 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Kees Cook <keescook@chromium.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the kbuild tree
Message-ID: <20240314094426.0d2b3d79@canb.auug.org.au>
In-Reply-To: <20240226165811.56f71171@canb.auug.org.au>
References: <20240226165811.56f71171@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GO0ujt7O9IZQpeVC.JAPY4Z";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/GO0ujt7O9IZQpeVC.JAPY4Z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 26 Feb 2024 16:58:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   scripts/Makefile.lib
>=20
> between commit:
>=20
>   bf48d9b756b9 ("kbuild: change tool coverage variables to take the path =
relative to $(obj)")
>=20
> from the kbuild tree and commits:
>=20
>   918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL")
>   557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
>=20
> from the kspp tree.
>=20
> I fixed it up (see below) 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
> diff --cc scripts/Makefile.lib
> index 298bd8c80d65,b4a248c20654..000000000000
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@@ -181,8 -175,11 +181,11 @@@ endi
>  =20
>   ifeq ($(CONFIG_UBSAN),y)
>   _c_flags +=3D $(if $(patsubst n%,, \
> - 		$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SAN=
ITIZE_ALL)), \
>  -		$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
> ++		$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
>   		$(CFLAGS_UBSAN))
> + _c_flags +=3D $(if $(patsubst n%,, \
>  -		$(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)=
$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> ++		$(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).=
o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> + 		$(CFLAGS_UBSAN_SIGNED_WRAP))
>   endif
>  =20
>   ifeq ($(CONFIG_KCOV),y)

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

--=20
Cheers,
Stephen Rothwell

--Sig_/GO0ujt7O9IZQpeVC.JAPY4Z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXyLEoACgkQAVBC80lX
0GwE9Af+On16ur/pW+Et6PQXq0dcC2mug9g38fwHD6mStE3iOCW/L8hRwBzcekCK
jUCvpC7H3DJHW+elcUUDvG5hDLGP5YKH0lpIofQjbJpnr0gSQCRi8OmLckeaPJM5
j8Uu8R9HNcFtK9K3pwYhEBjdArk6R7sSEOQjA/HpkvmscYVquXrhCeq/qE5gfXYc
O7B+h7i1GXkCu7gBT6EWATxaW0S5EQMhBR2ET2mRyU1DwE6Q5gFydnMxFVVKEgHv
atnKzsuJFzJiEoWDAQ+gRo49DxC7qQ7uodHxyz8B7LBiWwNpjpw5mWLIM2RsCLoh
Bw8FJuxYEycUL1sFbhdA3d/IY5DhTg==
=893b
-----END PGP SIGNATURE-----

--Sig_/GO0ujt7O9IZQpeVC.JAPY4Z--