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, 10 May 2023 10:55:43 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>
Cc:     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-idmapping
 tree
Message-ID: <20230510105543.165f102b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/j/8SnGv4k5sgQbrHyxE3M0a";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/j/8SnGv4k5sgQbrHyxE3M0a
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/pipe.c

between commit:

  2b10649c2316 ("pipe: enable handling of IOCB_NOWAIT")

from the vfs-idmapping tree and commit:

  3f6ded8dd89d ("pipe: check for IOCB_NOWAIT alongside O_NONBLOCK")

from the block tree.

The former added

	const bool nonblock =3D iocb->ki_flags & IOCB_NOWAIT;

and then did

-		if (filp->f_flags & O_NONBLOCK) {
+		if (filp->f_flags & O_NONBLOCK || nonblock) {

while the latter just did

-		if (filp->f_flags & O_NONBLOCK) {
+		if (filp->f_flags & O_NONBLOCK || iocb->ki_flags & IOCB_NOWAIT) {

so I just used the former though I suspect that the former may be a
previous version of these changes?).

I fixed it up (see above) 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_/j/8SnGv4k5sgQbrHyxE3M0a
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRa648ACgkQAVBC80lX
0GzFMwf9GywO9l1OBN5eJl56rHyirZpYR8M/C6C1+wwg+squH8GG7GX/7JoMaVqG
t2tcu1h8tmfc3+brim/YnTLXhl4tkbHjl7CjiNrCxIu7Xz20Qd7kcaLi4OxVJiJS
s9Oa5ZJ7RBVa7lEB597mR8xXz+p1uUT7Q53GDppl4QF7NyZg4tqRrfqJBXcDn7is
oWep6EzA7HMvREdRljjp3jIqHaGUKC2Q2wcyu3ylScviRX7xEp0zRzwlr0ECTQ0F
bN00TkyAuKk7kgHCSuVxPFIv3cipNMks6LCEDlDOb0De4rfLOSbOXHfc9S8mJYJB
mFORgYZ6eyToHan4g1UZCEUFeu//1Q==
=nxE1
-----END PGP SIGNATURE-----

--Sig_/j/8SnGv4k5sgQbrHyxE3M0a--