Received-SPF: pass (google.com: domain of linux-kernel+bounces-178206-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 14 May 2024 10:21:57 +1000
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: <20240514102157.46a330a7@canb.auug.org.au>
In-Reply-To: <20240513151316.6bd6fc87@canb.auug.org.au>
References: <20240513151316.6bd6fc87@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/JmJ5pY5OSQ.th164gsgGMCL";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Mon, 13 May 2024 15:13:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   drivers/misc/lkdtm/Makefile
>=20
> between commit:
>=20
>   9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables")
>=20
> from the kbuild tree and commit:
>=20
>   fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions")
>=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
>=20
> 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_FL=
AGS_CFI)
>  =20
>   OBJCOPYFLAGS :=3D
>   OBJCOPYFLAGS_rodata_objcopy.o	:=3D \

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

--=20
Cheers,
Stephen Rothwell

--Sig_/JmJ5pY5OSQ.th164gsgGMCL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCrqUACgkQAVBC80lX
0GzipAf+OL6Wke0xGW18jyKdWc5GS6Gj6iZHnM1VZHYIa63FE5UAyLwuSQ+qsgYX
OhyICGU+gLgCosufc3bRE6rqs8GsEwmQI1UzpsCJVGqItncMauFchy5Y6L419RRB
cyfFJcn5/xV0pW2BIYdYlkrqCAp61yNjct2IhNq8w+T16T6EkvI7iAlOrZiyMzXM
1t4iQvFap6YLm4MMF3/kHUayJeN2nbOp1IarSRMfDuz70uuePa2t/x2Jfd1IPEWI
iwGINItpK39/h8ye2rVZAcH1X04yOdPuwwiqUS2Z3m2F6nZ+lhO4SsulG2hE0r39
tQWkmKrkjexr2uI5KqlCsxFlsvfzFQ==
=5vuu
-----END PGP SIGNATURE-----

--Sig_/JmJ5pY5OSQ.th164gsgGMCL--