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:   Tue, 24 May 2022 08:54:35 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Al Viro <viro@zeniv.linux.org.uk>
Cc:     Jens Axboe <axboe@kernel.dk>, Dylan Yudaken <dylany@fb.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the vfs tree
Message-ID: <20220524085435.1763fcfb@canb.auug.org.au>
In-Reply-To: <20220523122827.657f2ab8@canb.auug.org.au>
References: <20220523122827.657f2ab8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_//s_58=aJ5yUnfz4Eu5betNS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Mon, 23 May 2022 12:28:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>=20
>   fs/io_uring.c
>=20
> between commit:
>=20
>   4329490a78b6 ("io_uring_enter(): don't leave f.flags uninitialized")
>=20
> from the vfs tree and commit:
>=20
>   3e813c902672 ("io_uring: rework io_uring_enter to simplify return value=
")
>=20
> from the block tree.
>=20
> 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
> 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


This is now a conflict between Linus' tree and the vfs tree.
--=20
Cheers,
Stephen Rothwell

--Sig_//s_58=aJ5yUnfz4Eu5betNS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKMEKsACgkQAVBC80lX
0GxzvggAgUZBYeFC28p6bDG6SAJfv/uowSl8o0GYst0PvoolGwemW4EdM7mfZola
f1k2fBWa3wcoQVkSFxTBtadDyHzjhOQHdo4RL2I0wXprdD44Zsh1lWIGwez8GscJ
4U26TwRr2QZy9sxX7eFafoKH4FeoKkjFnp6dWkEijLtQT0QaTzW1G0WvSJLs3+rx
haAyq/cqLuceN7Dj3sJFcILKTW6JADbNGxKbY0MtokcrZB3AEQhYjenD4MzAumDO
I7cyb6Bn0DtbRGEIScWP/i8krHRUDnywxnhpZSSH425Hl4okBSUWj/oRyB5rL9LA
GJYyTOk+/Wyx2HF71ga+MyF754wWVA==
=wgrv
-----END PGP SIGNATURE-----

--Sig_//s_58=aJ5yUnfz4Eu5betNS--