Received-SPF: pass (google.com: domain of linux-kernel+bounces-73996-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Wed, 21 Feb 2024 14:20:51 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yury Norov <yury.norov@gmail.com>, Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, 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 bitmap tree with the block tree
Message-ID: <20240221142051.4509d214@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XSxZsETA=CNUVatTwTG+TcD";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/XSxZsETA=CNUVatTwTG+TcD
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/block/null_blk/main.c

between commit:

  8b631f9cf0b8 ("null_blk: remove the bio based I/O path")

from the block tree and commit:

  f3687f2f7db4 ("block: null_blk: replace get_tag() with a generic find_and=
_set_bit_lock()")

from the bitmap tree.

I fixed it up (the former removed the code updated by the latter) 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

--Sig_/XSxZsETA=CNUVatTwTG+TcD
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXVbBMACgkQAVBC80lX
0Gyjowf7BxyoPVDebT4dzznMrC+aB8yDVU0b7lzxSgvNFSHiblNwLdfpA/SJk01M
RzQH61dtM4Rew8XhongGm1VyM9ybBfQsOKyRX8jfat6nldsN53agwE8Kic40Ic5h
U77pxmSxyFGadRK6OqtnU/lwlyUGMg8Ed19xcN0UWZ3ieq+Cn8inElDwsSChb2oV
aJ+kvPmJibBOvTpSMj2oajqU5zOunRn4F0MCR0dgBtUcJevmrffVgPEL8Rb9GgQl
bqUx/+mqoQOGUz3gMcsmG9uTq87twXwp4KHmzuXWCyJ0A6eVsFnd2UIWpAHGt4CL
eF99yF6azPzaJ/NM+ciVtHLHqBVgqA==
=fcfk
-----END PGP SIGNATURE-----

--Sig_/XSxZsETA=CNUVatTwTG+TcD--