Received-SPF: pass (google.com: domain of linux-kernel+bounces-87896-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 1 Mar 2024 15:43:51 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>, Kent Overstreet
 <kent.overstreet@linux.dev>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kspp tree with the bcachefs tree
Message-ID: <20240301154351.1d097566@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/0fkbFW/mkj3_Ipdtx5Rv2PT";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/0fkbFW/mkj3_Ipdtx5Rv2PT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  lib/Makefile

between commit:

  f6099c0b0300 ("darray: lift from bcachefs")

from the bcachefs tree and commit:

  257e66e5800a ("string: Convert selftest to KUnit")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc lib/Makefile
index ec3d915e7889,97c42e38046f..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -48,10 -48,10 +48,10 @@@ obj-y +=3D bcd.o sort.o parser.o debug_lo
  	 bsearch.o find_bit.o llist.o lwq.o memweight.o kfifo.o \
  	 percpu-refcount.o rhashtable.o base64.o \
  	 once.o refcount.o rcuref.o usercopy.o errseq.o bucket_locks.o \
 -	 generic-radix-tree.o bitmap-str.o
 +	 generic-radix-tree.o bitmap-str.o darray.o
- obj-$(CONFIG_STRING_SELFTEST) +=3D test_string.o
+ obj-$(CONFIG_STRING_KUNIT_TEST) +=3D string_kunit.o
  obj-y +=3D string_helpers.o
- obj-$(CONFIG_TEST_STRING_HELPERS) +=3D test-string_helpers.o
+ obj-$(CONFIG_STRING_HELPERS_KUNIT_TEST) +=3D string_helpers_kunit.o
  obj-y +=3D hexdump.o
  obj-$(CONFIG_TEST_HEXDUMP) +=3D test_hexdump.o
  obj-y +=3D kstrtox.o

--Sig_/0fkbFW/mkj3_Ipdtx5Rv2PT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXhXQcACgkQAVBC80lX
0Gx3zAf/QV4nKxWGSgdgTatdZaeJ3jqFz7piy8oLPIcKqtl63wvQOOjAOOiPU+nI
5gh+xyNMtVvUblP8tWgbBMcXLJ4Ogdx+BBJIFwfcFa7K7dkzVj+j0CEiQQ9CoO4C
a2Sb53gdYZFmKshLhHLlESgSB/pqueiXPFzXfC72iW9aofuBSRmKcLwac8dJWIih
AF7Be3prVdp1OTmrfo7JdivRvOfTqIqUuWL2wtykqRaXS1D0o8M29S6MxLZPryr/
81EaGZxYYlZb6eg+FwWfQpr2COtwTsXkIRJhVmqwIxhXj/BlQBGMXbxgt5xAN1TC
FjvCpiqxR9a30yrqOPJBYtToB2vuwg==
=C1/1
-----END PGP SIGNATURE-----

--Sig_/0fkbFW/mkj3_Ipdtx5Rv2PT--