Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 9 Aug 2023 11:03:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Chuck Lever <chuck.lever@oracle.com>
Cc:     Chengming Zhou <zhouchengming@bytedance.com>,
        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 block tree with the nfsd tree
Message-ID: <20230809110334.63b7c566@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jBABNubXVx_rOnM0DH/5UmW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/jBABNubXVx_rOnM0DH/5UmW
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-flush.c

between commit:

  bed5a600c6b0 ("block: Revert 615939a2ae73")

from the nfsd tree and commits:

  28b241237470 ("blk-flush: fix rq->flush.seq for post-flush requests")
  b175c86739d3 ("blk-flush: count inflight flush_data requests")

from the block tree.

I fixed it up (I used the former, though I wonder if 28b241237470 fixes
what the revert is trying to work around) 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_/jBABNubXVx_rOnM0DH/5UmW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTS5eYACgkQAVBC80lX
0Gx0mQf+IbSq2UQwNmusD+Hs+m2WQO1qtnfEBLLDFnytqO1vK12mTsFwlUVoQRZz
BGnLdBrKQSFwCeTFo1UGdOBnAu+47mHB6sref7/LHZB6cuEiVf2qlajocCgWU6cS
7LezpqLn6JrGMn7nKI7GtdgjSkr9fRqqrgkTPNWREIpGosOUZUsuzlpV7AomAjXM
qnilHK+17zKxTI86XyYCoO0Gug163WpJTt6FQxurt+LCahUk6at+/5a8kXwxOHGg
0G4bgYsRAxRfAIhbGUtgut+dI1ORpp+Vv4YwKI8YwnYHpYmtgh7W6xSBOubcGrv3
rm4ypFDYvLXEwa/v9GK1K9Bizc6bNg==
=nJqu
-----END PGP SIGNATURE-----

--Sig_/jBABNubXVx_rOnM0DH/5UmW--