Received-SPF: pass (google.com: domain of linux-kernel+bounces-186839-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: Thu, 23 May 2024 09:50:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Yu Kuai <yukuai3@huawei.com>
Subject: linux-next: manual merge of the block tree with Linus' tree
Message-ID: <20240523095035.11a94157@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MYSUCo8Lgxu//nXPbWPHJqf";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/MYSUCo8Lgxu//nXPbWPHJqf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  block/blk-core.c

between commit:

  ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")

from Linus' tree and commit:

  9a42891c35d5 ("block: fix lost bio for plug enabled bio based device")

from the block 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 block/blk-core.c
index ea44b13af9af,dd29d5465af6..000000000000
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@@ -618,7 -619,9 +621,9 @@@ static void __submit_bio(struct bio *bi
  	if (unlikely(!blk_crypto_bio_prep(&bio)))
  		return;
 =20
+ 	blk_start_plug(&plug);
+=20
 -	if (!bio->bi_bdev->bd_has_submit_bio) {
 +	if (!bdev_test_flag(bio->bi_bdev, BD_HAS_SUBMIT_BIO)) {
  		blk_mq_submit_bio(bio);
  	} else if (likely(bio_queue_enter(bio) =3D=3D 0)) {
  		struct gendisk *disk =3D bio->bi_bdev->bd_disk;

--Sig_/MYSUCo8Lgxu//nXPbWPHJqf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZOhMsACgkQAVBC80lX
0GxNjgf/RTz0nSBSyji3aQYYunxXyxFHoiuMSJmf0/JX6zMCgZT7lULIW/BOVEiN
4GCKGh4wGbHW0WoamuqxoALppFGyiX9/+VafNYmglxuDap+0H6qURqH1xrwPy1an
wZE27ZwKfLjJ2m3BHl0kQrv07AcfaHoIkiu4iNdfqCr9JieUIQoP2X/mBU1+YkWK
tNvCiIlWeZSeMRomQzPHnzmSVLMmAep5G8Us1y6wKlfxxj5SwZmn80pYBRxdqJVC
lf1QuA/gnw/W39xdQMjVxwrPL+p6btz9h2kVaHJVf1zi/Xj7bY6ZIeHwy1cmvRNr
1Eepz4wwe1zBzzmTVie+18lkOarGZg==
=nnNX
-----END PGP SIGNATURE-----

--Sig_/MYSUCo8Lgxu//nXPbWPHJqf--