Received-SPF: pass (google.com: domain of linux-kernel+bounces-175213-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 10 May 2024 12:34:19 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: 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 the vfs tree
Message-ID: <20240510123419.42f727c1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Mv/csblki8sFVb0r.brxG_q";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Mv/csblki8sFVb0r.brxG_q
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:

  3f9b8fb46e5d ("Use bdev_is_paritition() instead of open-coding it")

from the vfs tree and commit:

  99dc422335d8 ("block: support to account io_ticks precisely")

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 a4035dc7640d,01186333c88e..000000000000
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@@ -990,11 -986,12 +989,12 @@@ void update_io_ticks(struct block_devic
  	unsigned long stamp;
  again:
  	stamp =3D READ_ONCE(part->bd_stamp);
- 	if (unlikely(time_after(now, stamp))) {
- 		if (likely(try_cmpxchg(&part->bd_stamp, &stamp, now)))
- 			__part_stat_add(part, io_ticks, end ? now - stamp : 1);
- 	}
+ 	if (unlikely(time_after(now, stamp)) &&
+ 	    likely(try_cmpxchg(&part->bd_stamp, &stamp, now)) &&
+ 	    (end || part_in_flight(part)))
+ 		__part_stat_add(part, io_ticks, now - stamp);
+=20
 -	if (part->bd_partno) {
 +	if (bdev_is_partition(part)) {
  		part =3D bdev_whole(part);
  		goto again;
  	}

--Sig_/Mv/csblki8sFVb0r.brxG_q
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9h6sACgkQAVBC80lX
0GxadAf/aky9imn1d+DZPdqscorll9KRyQ3Ryt44jORhBPBXbMA3JjhObHR+eC10
C7ZMBsWTdbLnIfRnk5bObvjxn/F8d35pSn9tgn+pkddfYkJ6GuY9u0VGIGQ2UFMR
Kwk8UFdIGPibItKYJt0m+PTtzLDEKUu4hUVnYS3Xt8GhW5mRj6wYYxym7v/kXy4K
KxVknSPMo6HnnH5p8uwB+Dep24qPdhx5RfSKLP+qpwsvHqYkKj0xTRMV4+IpU11r
0dGc+GfNHPAehb+EPhfPzCOg0SjlmxvQntxiPPsfoX7LecbnLj5rXV11G4EHZ65w
Yev0sQ7Jisjc9H0jd5dDat0uOf4MTQ==
=Sage
-----END PGP SIGNATURE-----

--Sig_/Mv/csblki8sFVb0r.brxG_q--