On Tue, 6 Sept 2022 at 09:49, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > 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 accounting") > > 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. > > -- > 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. > > +config HW_BREAKPOINT_KUNIT_TEST > + bool "Test hw_breakpoint constraints accounting" if !KUNIT_ALL_TESTS > + depends on HAVE_HW_BREAKPOINT > + depends on KUNIT=y > + 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. > + > config TEST_UDELAY > tristate "udelay test driver" > help Looks good to me, thanks! Reviewed-by: Marco Elver <elver@xxxxxxxxxx>