Received-SPF: pass (google.com: domain of linux-kernel+bounces-184362-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: Tue, 21 May 2024 12:18:03 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>, Kuan-Wei Chiu
 <visitorckw@gmail.com>, Jens Axboe <axboe@kernel.dk>
Cc: Coly Li <colyli@suse.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Matthew Mirvish <matthew@mm12.xyz>, Bagas
 Sanjaya <bagasdotme@gmail.com>
Subject: Re: linux-next: manual merge of the refactor-heap tree with the
 block tree
Message-ID: <20240521121803.399705b0@canb.auug.org.au>
In-Reply-To: <20240509152745.08af752f@canb.auug.org.au>
References: <20240509152745.08af752f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/E64MYVQg+=E06o2PfjE4OCI";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/E64MYVQg+=E06o2PfjE4OCI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 9 May 2024 15:27:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the refactor-heap tree got conflicts in:
>=20
>   drivers/md/bcache/bset.c
>   drivers/md/bcache/bset.h
>   drivers/md/bcache/btree.c
>   drivers/md/bcache/writeback.c
>=20
> between commit:
>=20
>   3a861560ccb3 ("bcache: fix variable length array abuse in btree_iter")
>=20
> from the block tree and commit:
>=20
>   afa5721abaaa ("bcache: Remove heap-related macros and switch to generic=
 min_heap")
>=20
> from the refactor-heap tree.
>=20
> Ok, these conflicts are too extensive, so I am dropping the refactor-heap
> tree for today.  I suggest you all get together and sort something out.

I am still dropping the refactor-heap tree ...
--=20
Cheers,
Stephen Rothwell

--Sig_/E64MYVQg+=E06o2PfjE4OCI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZMBFwACgkQAVBC80lX
0GxE+wf5AVLlVQ+gex65stnPdygnx/uAhNLG2zsEPhtgtGk5fenlLVtq4NG/QSA9
jaVEUJlDAcVaQeg71nV36oiGVrbec1C2O+KKWSNGvtgPY+GK6aPUAT4JiM1TieZH
meRiGJTJslY6Mu4+IDqAcJ5JYIkohgQrBPxdkhpoZb6rBLia7b37JZorvF6LxsI2
hWMiHGOGnHtyAAOQfb2p/mROYgkvIfBvrM3nWp3pc9z5/CTzkb4H+vLJUalgrS8U
Pzlu/Ep9Loe86YNDYIX2O73DxhsVA5C+Q/vB9nwFJlxq9RXDA+hkU67uvQwp6VF/
UOsRREBvubaGwD3jn/Sc3DYaxAxI9g==
=W7ft
-----END PGP SIGNATURE-----

--Sig_/E64MYVQg+=E06o2PfjE4OCI--