From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <shuah@kernel•org>,
Brendan Higgins <brendanhiggins@google•com>
Cc: "Kees Cook" <kees@kernel•org>,
"Andrew Morton" <akpm@linux-foundation•org>,
"Sergio González Collado" <sergio.collado@gmail•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Nam Cao" <namcao@linutronix•de>,
"Thomas Gleixner" <tglx@linutronix•de>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix•de>
Subject: Re: linux-next: manual merge of the kspp tree with the kunit-next and mm trees
Date: Wed, 26 Mar 2025 15:57:35 +1100 [thread overview]
Message-ID: <20250326155735.55e4677c@canb.auug.org.au> (raw)
In-Reply-To: <20250317213953.01ca90e9@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3136 bytes --]
Hi all,
On Mon, 17 Mar 2025 21:39:53 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> lib/Makefile
>
> between commits:
>
> 62f3802332ed ("vdso: add generic time data storage")
>
> from the mm-unstable branch of the mm tree,
>
> c104c16073b7 ("Kunit to check the longest symbol length")
>
> from the kunit-next tree and commit:
>
> db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory")
>
> from the kspp tree.
>
> I fixed it up (see below and added a merge fix patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 17 Mar 2025 21:35:42 +1100
> Subject: [PATCH] fix up 2 for "lib: Move KUnit tests into tests/ subdirectory"
>
> interacting with commit
>
> c104c16073b7 ("Kunit to check the longest symbol length")
>
> from the kunit-next tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> lib/tests/Makefile | 2 ++
> lib/{ => tests}/longest_symbol_kunit.c | 0
> 2 files changed, 2 insertions(+)
> rename lib/{ => tests}/longest_symbol_kunit.c (100%)
>
> diff --git a/lib/tests/Makefile b/lib/tests/Makefile
> index a434c7cb733a..f2c3c4f74608 100644
> --- a/lib/tests/Makefile
> +++ b/lib/tests/Makefile
> @@ -20,6 +20,8 @@ CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
> obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
> obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
> obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
> +CFLAGS_longest_symbol_kunit.o += $(call cc-disable-warning, missing-prototypes)
> +obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o
> obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o
> obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
> obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
> diff --git a/lib/longest_symbol_kunit.c b/lib/tests/longest_symbol_kunit.c
> similarity index 100%
> rename from lib/longest_symbol_kunit.c
> rename to lib/tests/longest_symbol_kunit.c
> --
> 2.45.2
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc lib/Makefile
> index 651811f5d677,89b8a4bce108..000000000000
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@@ -131,7 -119,7 +118,7 @@@ endi
> obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
> CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
>
> - obj-y += math/ crypto/ vdso/
> -obj-y += math/ crypto/ tests/
> ++obj-y += math/ crypto/ vdso/ tests/
>
> obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
> obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
The "longest symbol length" part of this is now conflicts between
Linus' tree and the kunit-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-03-26 4:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 10:39 linux-next: manual merge of the kspp tree with the kunit-next and mm trees Stephen Rothwell
2025-03-26 4:57 ` 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=20250326155735.55e4677c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=brendanhiggins@google$(echo .)com \
--cc=kees@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=namcao@linutronix$(echo .)de \
--cc=sergio.collado@gmail$(echo .)com \
--cc=shuah@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=thomas.weissschuh@linutronix$(echo .)de \
/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