From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: "Paul E. McKenney" <paulmck@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel•org>
Subject: Re: linux-next: manual merge of the paulmck tree with the mm-nonmm-unstable tree
Date: Thu, 31 Jul 2025 11:07:27 +1000 [thread overview]
Message-ID: <20250731110727.5de9db79@canb.auug.org.au> (raw)
In-Reply-To: <20250729104245.6be6957a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2400 bytes --]
Hi all,
On Tue, 29 Jul 2025 10:42:45 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the paulmck tree got a conflict in:
>
> lib/Kconfig.debug
>
> between commit:
>
> c2d288f7ab13 ("kho: add test for kexec handover")
>
> from the mm-nonmm-unstable tree and commit:
>
> d19e9fa61f60 ("lib: Add trivial kunit test for ratelimit")
>
> from the paulmck 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.
>
>
> diff --cc lib/Kconfig.debug
> index 54f11c2713b9,d69d27f80834..000000000000
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@@ -3235,27 -3225,17 +3235,38 @@@ config TEST_OBJPOO
>
> If unsure, say N.
>
> +config TEST_KEXEC_HANDOVER
> + bool "Test for Kexec HandOver"
> + default n
> + depends on KEXEC_HANDOVER
> + help
> + This option enables test for Kexec HandOver (KHO).
> + The test consists of two parts: saving kernel data before kexec and
> + restoring the data after kexec and verifying that it was properly
> + handed over. This test module creates and saves data on the boot of
> + the first kernel and restores and verifies the data on the boot of
> + kexec'ed kernel.
> +
> + For detailed documentation about KHO, see Documentation/core-api/kho.
> +
> + To run the test run:
> +
> + tools/testing/selftests/kho/vmtest.sh -h
> +
> + If unsure, say N.
> +
> +
> + config RATELIMIT_KUNIT_TEST
> + tristate "KUnit Test for correctness and stress of ratelimit" if !KUNIT_ALL_TESTS
> + depends on KUNIT
> + default KUNIT_ALL_TESTS
> + help
> + This builds the "test_ratelimit" module that should be used
> + for correctness verification and concurrent testings of rate
> + limiting.
> +
> + If unsure, say N.
> +
> config INT_POW_KUNIT_TEST
> tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS
> depends on KUNIT
This is now a conflict between the mm-nonmm-unstable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-07-31 1:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 0:42 linux-next: manual merge of the paulmck tree with the mm-nonmm-unstable tree Stephen Rothwell
2025-07-29 4:28 ` Paul E. McKenney
2025-07-29 8:02 ` Mike Rapoport
2025-07-31 1:07 ` Stephen Rothwell [this message]
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=20250731110727.5de9db79@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=rppt@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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