linux-kernel - linux-next: manual merge of the kunit-next tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250317193621.4b4db936@canb.auug.org.au>
Date: Mon, 17 Mar 2025 19:36:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Shuah Khan <skhan@...uxfoundation.org>, Brendan Higgins
 <brendanhiggins@...gle.com>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Sergio González Collado
 <sergio.collado@...il.com>, Shuah Khan <shuah@...nel.org>, Tamir Duberstein
 <tamird@...il.com>
Subject: linux-next: manual merge of the kunit-next tree with the net-next
 tree

Hi all,

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

  lib/Makefile

between commit:

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

from the net-next tree and commit:

  c104c16073b7 ("Kunit to check the longest symbol length")

from the kunit-next 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/Makefile
index 66e44569b141,e8fec9defec2..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -392,7 -393,8 +392,9 @@@ obj-$(CONFIG_FORTIFY_KUNIT_TEST) += for
  obj-$(CONFIG_CRC_KUNIT_TEST) += crc_kunit.o
  obj-$(CONFIG_SIPHASH_KUNIT_TEST) += siphash_kunit.o
  obj-$(CONFIG_USERCOPY_KUNIT_TEST) += usercopy_kunit.o
 +obj-$(CONFIG_BLACKHOLE_DEV_KUNIT_TEST) += blackhole_dev_kunit.o
+ obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o
+ CFLAGS_longest_symbol_kunit.o += $(call cc-disable-warning, missing-prototypes)
  
  obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o
  

Content of type "application/pgp-signature" skipped