Received-SPF: pass (google.com: domain of linux-kernel+bounces-177160-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 13 May 2024 15:13:16 +1000
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: <20240513151316.6bd6fc87@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6mPkapmrzNAtPfdOkQ.Op.t";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/6mPkapmrzNAtPfdOkQ.Op.t
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:

  drivers/misc/lkdtm/Makefile

between commit:

  9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables")

from the kbuild tree and commit:

  fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions")

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 drivers/misc/lkdtm/Makefile
index 33fe61152a15,b28701138b4b..000000000000
--- a/drivers/misc/lkdtm/Makefile
+++ b/drivers/misc/lkdtm/Makefile
@@@ -15,7 -15,11 +15,7 @@@ lkdtm-$(CONFIG_PPC_64S_HASH_MMU)	+=3D pow
 =20
  KASAN_SANITIZE_stackleak.o	:=3D n
 =20
- CFLAGS_REMOVE_rodata.o			+=3D $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS)
 -KASAN_SANITIZE_rodata.o			:=3D n
 -KCSAN_SANITIZE_rodata.o			:=3D n
 -KCOV_INSTRUMENT_rodata.o		:=3D n
 -OBJECT_FILES_NON_STANDARD_rodata.o	:=3D y
+ CFLAGS_REMOVE_rodata.o			+=3D $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS) $(CC_FLAG=
S_CFI)
 =20
  OBJCOPYFLAGS :=3D
  OBJCOPYFLAGS_rodata_objcopy.o	:=3D \

--Sig_/6mPkapmrzNAtPfdOkQ.Op.t
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZBoWwACgkQAVBC80lX
0GxfjAf+InmmGo1j/RvCQ42kViYB+skG6eNP7D1RA5/PPnmvtan/MkfSOy+wfaxw
6njlSOz0PS+wjIFE9Q9AYQ6g2bmPDtE8xVO5G5C2I52cC46KX9BDjj8Wk1sXjLkB
CCLT468CtDkEot+IbE74PiX+zVHJ6W0hpf8GkfzX9+SeAH4vl+QcjEp/ylagKIf0
Szr7NYZmkFIQ2hm7/s36eadXXNwav4z3696Z71fwabgSTLcCvNX15N0voPF3adVp
tyhUO/NKOyrp8dTkgzN1B8Fx4RhGVL25MYgJxxJeMjopgb7xqSS4V9eEu26c0C4L
MhIaT8anh3pLnkS7N8uvY9IH4fKaQg==
=+5g3
-----END PGP SIGNATURE-----

--Sig_/6mPkapmrzNAtPfdOkQ.Op.t--