Received-SPF: pass (google.com: domain of linux-kernel+bounces-75947-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: Thu, 22 Feb 2024 16:41:12 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>, Andrew Morton
 <akpm@linux-foundation.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 mm tree
Message-ID: <20240222164112.20c5646e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/in8Tuk7waFON2ccEBaZB8ct";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  scripts/Makefile.lib
  scripts/Makefile.ubsan

between commit:

  1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer")

from the mm-unstable branch of the mm tree and commit:

  557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")

from the kspp tree.

So, the conflicts looked like this:

scripts/Makefile.lib:

ifeq ($(CONFIG_UBSAN),y)
_c_flags +=3D $(if $(patsubst n%,, \
		$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN))
_c_flags +=3D $(if $(patsubst n%,, \
<<<<<<< HEAD
		$(UBSAN_WRAP_SIGNED_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UB=
SAN_WRAP_SIGNED)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN_WRAP_SIGNED))
=3D=3D=3D=3D=3D=3D=3D
		$(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UB=
SAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN_SIGNED_WRAP))
>>>>>>> kspp/for-next/kspp
endif

scripts/Makefile.ubsan:

export CFLAGS_UBSAN :=3D $(ubsan-cflags-y)

<<<<<<< HEAD
ubsan-wrap-signed-cflags-$(CONFIG_UBSAN_SIGNED_WRAP)     +=3D -fsanitize=3D=
signed-integer-overflow
export CFLAGS_UBSAN_WRAP_SIGNED :=3D $(ubsan-wrap-signed-cflags-y)
=3D=3D=3D=3D=3D=3D=3D
ubsan-signed-wrap-cflags-$(CONFIG_UBSAN_SIGNED_WRAP)     +=3D -fsanitize=3D=
signed-integer-overflow
export CFLAGS_UBSAN_SIGNED_WRAP :=3D $(ubsan-signed-wrap-cflags-y)
>>>>>>> kspp/for-next/kspp

I fixed it up (I just used the kspp tree version (arbitrarily)) 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_/in8Tuk7waFON2ccEBaZB8ct
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXW3ngACgkQAVBC80lX
0GyOswf/XEl9X5KzBmMth0TvJJXb7T39WjMe40xE27GYDIPeUNnq0cYk3UekKhzo
1b/xlH2rcQhK24ZBE8ua6vZs6FjwIwuDoQBzxucv3+oz6o+D2XJ8lRNV0c5Lpq2Q
vHhH3YmJSpRAwYZpSXJ8ysD6UKhyLHVgWv4WBHaUfZR2gt/JkWAlleC/ZDYRmbPa
cW+9xVFXCQM7/vLDkoWHTzq7mFKkigK6/uEPpinzN1NDU3TnJHkEuZxNKJSKoJWj
yR+zEMHjADF6jM+AtvMgES7kgvsVRYQpmDD+nYgdJrUanS5LSQEWjbuliCsdheRQ
xYMeFzkdHnIdBahzauOeZhe8S5COdA==
=IkEk
-----END PGP SIGNATURE-----

--Sig_/in8Tuk7waFON2ccEBaZB8ct--