From: Marco Elver <elver@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
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 tip tree
Date: Tue, 6 Sep 2022 10:41:11 +0200 [thread overview]
Message-ID: <CANpmjNPuG+=qoiZ6M3UzZNfXq3tpS59GPrH358md+q5gxZzTRg@mail.gmail.com> (raw)
In-Reply-To: <20220906174946.61819060@canb.auug.org.au>
On Tue, 6 Sept 2022 at 09:49, Stephen Rothwell <sfr@canb.auug.org.au> 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@google.com>
next prev parent reply other threads:[~2022-09-06 8:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 7:49 linux-next: manual merge of the kspp tree with the tip tree Stephen Rothwell
2022-09-06 8:41 ` Marco Elver [this message]
2022-10-05 2:54 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-11-06 5:03 Stephen Rothwell
2019-11-06 7:28 ` Cyrill Gorcunov
2018-10-08 5:44 Stephen Rothwell
2018-09-07 3:05 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANpmjNPuG+=qoiZ6M3UzZNfXq3tpS59GPrH358md+q5gxZzTRg@mail.gmail.com' \
--to=elver@google.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).