Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Mon, 23 May 2022 12:28:27 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Al Viro <viro@zeniv.linux.org.uk>
Cc:     Dylan Yudaken <dylany@fb.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 vfs tree
Message-ID: <20220523122827.657f2ab8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BWaq7T4Bp9FO_XHOmn6zcfF";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/BWaq7T4Bp9FO_XHOmn6zcfF
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:

  fs/io_uring.c

between commit:

  4329490a78b6 ("io_uring_enter(): don't leave f.flags uninitialized")

from the vfs tree and commit:

  3e813c902672 ("io_uring: rework io_uring_enter to simplify return value")

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 fs/io_uring.c
index 82a1eac73de7,fd47002e669d..000000000000
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -10840,8 -12060,9 +12060,8 @@@ iopoll_locked
  out:
  	percpu_ref_put(&ctx->refs);
  out_fput:
 -	if (!(flags & IORING_ENTER_REGISTERED_RING))
 -		fdput(f);
 +	fdput(f);
- 	return submitted ? submitted : ret;
+ 	return ret;
  }
 =20
  #ifdef CONFIG_PROC_FS

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKK8UsACgkQAVBC80lX
0Gx68Af+M/jeVemOYvTSkZn2s6s4uL5DSEeH6p44oqyFpaBD/8EdULoKNpDsWYKY
oTjv6X/PGrQr4X/TdgcUUfgYiwkhki/cj2ZNHOqjxBSxNvZoUoBZh+HIYMQr74+W
n8qqpLDh0LOtPRMxFgEK8zjNrekr9NibbuagFcZTPfQZXerrquEXNamW2oJnqySu
GwwkiDxGPu5F6yTK22+5QjggylVVq13npqlyD1tsfcYkqfQ6Nj9rcQvnHLPWpL0w
ZaVPlfih16eqPsbBHnR37+HtYvGNY5in/oARNBIUcwo1ES6Tt45LmZnAeEkUEWxB
nTIokkqEXbL3LelKDIfYiDYGgc0XMg==
=DY4O
-----END PGP SIGNATURE-----

--Sig_/BWaq7T4Bp9FO_XHOmn6zcfF--