Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 6 Sep 2022 17:49:46 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kees Cook <keescook@chromium.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Marco Elver <elver@google.com>
Subject: linux-next: manual merge of the kspp tree with the tip tree
Message-ID: <20220906174946.61819060@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sp=cXDFOcebNKKIpMUPGYwG";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/sp=cXDFOcebNKKIpMUPGYwG
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:

  lib/Kconfig.debug

between commit:

  724c299c6a0e ("perf/hw_breakpoint: Add KUnit test for constraints account=
ing")

from the tip tree and commit:

  bb26bbd0a067 ("fortify: Add KUnit test for FORTIFY_SOURCE internals")

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 lib/Kconfig.debug
index e40550a5bdd3,1f267c0ddffd..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2533,16 -2542,15 +2545,25 @@@ config STACKINIT_KUNIT_TES
  	  CONFIG_GCC_PLUGIN_STRUCTLEAK, CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF,
  	  or CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL.
 =20
 +config HW_BREAKPOINT_KUNIT_TEST
 +	bool "Test hw_breakpoint constraints accounting" if !KUNIT_ALL_TESTS
 +	depends on HAVE_HW_BREAKPOINT
 +	depends on KUNIT=3Dy
 +	default KUNIT_ALL_TESTS
 +	help
 +	  Tests for hw_breakpoint constraints accounting.
 +
 +	  If unsure, say N.
 +
+ config FORTIFY_KUNIT_TEST
+ 	tristate "Test fortified str*() and mem*() function internals at runtime=
" if !KUNIT_ALL_TESTS
+ 	depends on KUNIT && FORTIFY_SOURCE
+ 	default KUNIT_ALL_TESTS
+ 	help
+ 	  Builds unit tests for checking internals of FORTIFY_SOURCE as used
+ 	  by the str*() and mem*() family of functions. For testing runtime
+ 	  traps of FORTIFY_SOURCE, see LKDTM's "FORTIFY_*" tests.
+=20
  config TEST_UDELAY
  	tristate "udelay test driver"
  	help

--Sig_/sp=cXDFOcebNKKIpMUPGYwG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMW+5oACgkQAVBC80lX
0GyA1Af8DzWPSckiL++ldBVfvWwMRtj/iwCV2e2ykXVo5kqrXirY/aWEPxRKtSrI
SKLXhPheZufg2Uyf2nYUy6HxrKvfRnsrpqfuWHOybZi6ni/iVwQ7hvlfx7nBesCg
mIeqs/a+0G02YEbrt4sZ1KsKydnVbfAX/IL1lJbq3vlKhukha5HO0XDxqoyW3QPl
4AeqKuSPbVwBn2q0/ep9dz1kfp/na0q79CxNSojAbMYNz68MXxH4SgxbhM7/y5dV
D0B4kPI1sta3cQZn5jq8yqnKcrIFIrAxFHQDgI1GfseMIvqTBXkPujxREWm6X7n3
MViWBYX+Qsyt0Q/gaXtCCOe2DakDUw==
=AGFo
-----END PGP SIGNATURE-----

--Sig_/sp=cXDFOcebNKKIpMUPGYwG--