Received-SPF: pass (google.com: domain of linux-kernel+bounces-80574-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 26 Feb 2024 16:58:11 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>, Masahiro Yamada
 <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kspp tree with the kbuild tree
Message-ID: <20240226165811.56f71171@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Fh/hyUwCNLuBEw..bgQgHf5";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Fh/hyUwCNLuBEw..bgQgHf5
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  scripts/Makefile.lib

between commit:

  bf48d9b756b9 ("kbuild: change tool coverage variables to take the path re=
lative to $(obj)")

from the kbuild tree and commits:

  918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL")
  557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")

from the kspp tree.

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
Cheers,
Stephen Rothwell

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_SANIT=
IZE_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)

--Sig_/Fh/hyUwCNLuBEw..bgQgHf5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXcKHMACgkQAVBC80lX
0GzAQAgAlAXcMRY5vjWu76VfBIgkHbdeaQwU9E779u7Wh5IoyJMGeFmkGyC2YlT+
xA905TR3InKukBjgk9BWBd5Vz7cMWmozvwOeRES6wHq5EsIa0KP1O0Y9jPEWdk1A
uTwDiwV7tu+tt+BEKjJqQmooHQ7NPZwNic+3y9WrwEir4nnNoyMqewqLTrKJFw3F
bndB/MExAwlxuzaOeJaRuf7UjWjeAS5+05rAPRpW9ZvCLGIleJdupoKplU2/r7Jz
oXr5rVMZpQ+rFhBhWmixWmCXqehc+rTCRY9rPe1S74YZm0Pn5mAJdE87jWbRxlgg
yNBl8LXRZlnLTlKfM0eAdvRvDrpEhA==
=nnFF
-----END PGP SIGNATURE-----

--Sig_/Fh/hyUwCNLuBEw..bgQgHf5--