public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kees Cook <kees@kernel•org>, David Miller <davem@davemloft•net>,
	Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Tamir Duberstein <tamird@gmail•com>
Subject: linux-next: manual merge of the kspp tree with the net-next tree
Date: Thu, 13 Feb 2025 15:19:27 +1100	[thread overview]
Message-ID: <20250213151927.1674562e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]

Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

  lib/Makefile

between commit:

  b341f6fd45ab ("blackhole_dev: convert self-test to KUnit")

from the net-next tree and commit:

  db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory")

from the kspp tree.

I fixed it up (I used the latter version of this file and applied the
following 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: Thu, 13 Feb 2025 14:50:27 +1100
Subject: [PATCH] fix up for "lib: Move KUnit tests into tests/ subdirectory"

interacting with commit

  b341f6fd45ab ("blackhole_dev: convert self-test to KUnit")

from the net-next tree.

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 lib/tests/Makefile                    | 1 +
 lib/{ => tests}/blackhole_dev_kunit.c | 0
 2 files changed, 1 insertion(+)
 rename lib/{ => tests}/blackhole_dev_kunit.c (100%)

diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index 8696d778d92f..8961fbcff7a4 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -6,6 +6,7 @@
 CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN)
 obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o
 obj-$(CONFIG_BITS_TEST) += test_bits.o
+obj-$(CONFIG_BLACKHOLE_DEV_KUNIT_TEST) += blackhole_dev_kunit.o
 obj-$(CONFIG_CHECKSUM_KUNIT) += checksum_kunit.o
 obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
 obj-$(CONFIG_CPUMASK_KUNIT_TEST) += cpumask_kunit.o
diff --git a/lib/blackhole_dev_kunit.c b/lib/tests/blackhole_dev_kunit.c
similarity index 100%
rename from lib/blackhole_dev_kunit.c
rename to lib/tests/blackhole_dev_kunit.c
-- 
2.45.2



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2025-02-13  4:19 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-13  4:19 Stephen Rothwell [this message]
2025-03-26  4:54 ` linux-next: manual merge of the kspp tree with the net-next tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07  5:29 Stephen Rothwell
2024-03-07 19:23 ` Kees Cook
2020-07-27  9:27 Stephen Rothwell
2020-08-05  4:05 ` Stephen Rothwell
2017-02-22  0:06 Stephen Rothwell
2017-02-22  6:35 ` Daniel Borkmann
2017-02-21 23:51 Stephen Rothwell
2017-02-22  6:37 ` Daniel Borkmann
2017-02-19 23:56 Stephen Rothwell
2017-02-20  9:01 ` Daniel Borkmann
2017-02-08  1:30 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=20250213151927.1674562e@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=davem@davemloft$(echo .)net \
    --cc=kees@kernel$(echo .)org \
    --cc=kuba@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=pabeni@redhat$(echo .)com \
    --cc=tamird@gmail$(echo .)com \
    /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