Received-SPF: pass (google.com: domain of linux-kernel+bounces-102646-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 14 Mar 2024 10:37:49 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Kees Cook <keescook@chromium.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the bcachefs
 tree
Message-ID: <20240314103749.69a36bc6@canb.auug.org.au>
In-Reply-To: <20240301154351.1d097566@canb.auug.org.au>
References: <20240301154351.1d097566@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/748TZZ/RMYp2vSns5JMPamk";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/748TZZ/RMYp2vSns5JMPamk
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 1 Mar 2024 15:43:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   lib/Makefile
>=20
> between commit:
>=20
>   f6099c0b0300 ("darray: lift from bcachefs")
>=20
> from the bcachefs tree and commit:
>=20
>   257e66e5800a ("string: Convert selftest to KUnit")
>=20
> from the kspp tree.
>=20
> 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
> 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

This is now a conflict between the bcachefs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/748TZZ/RMYp2vSns5JMPamk
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXyOM0ACgkQAVBC80lX
0Gy9Fgf8CeAUQiJrjeVvCvUngC80JaYcx7zugfv6S6Lt2u829zCZfvsNHahkd5mR
G4IUqoRteOK/jXU4YhXpRC7DbiRElLZ8MCfwfPhSjK6MKQN17WBOMPw2woH81DNe
/rAIyM71XlIbgs+j1xMUryFxSpJXciOO4fI1eYBT/+cjPzVPODTPlwCR3yW4OjFm
odptPL+VzkAdA8sxsk242maXfjhotra/aS/8xN0dycwyPPSLKA4PrdtqgtjoLE/d
YlgSQzGAQ0WpqmKknP7bo0wcF/mZI93InTa8MZZ2Zl+P32oNK/ONzdsvCoKPMZnG
OpfEKtMOOqPblQinmkrsLybbkb/fyw==
=Kq6H
-----END PGP SIGNATURE-----

--Sig_/748TZZ/RMYp2vSns5JMPamk--