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:   Mon, 26 Jun 2023 13:04:09 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
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 Linus' tree
Message-ID: <20230626130409.1ae2b54e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bOHHKOyCXE1/DXONO1ubTfv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/bOHHKOyCXE1/DXONO1ubTfv
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:

  io_uring/net.c

between commit:

  78d0d2063bab ("io_uring/net: disable partial retries for recvmsg with cms=
g")

from Linus' tree and commit:

  88fc8b8463b0 ("io_uring/net: initalize msghdr->msg_inq to known 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 io_uring/net.c
index 4b8e84768d2a,369167e45fa8..000000000000
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@@ -790,19 -794,17 +803,20 @@@ retry_multishot
  	flags =3D sr->msg_flags;
  	if (force_nonblock)
  		flags |=3D MSG_DONTWAIT;
 -	if (flags & MSG_WAITALL)
 -		min_ret =3D iov_iter_count(&kmsg->msg.msg_iter);
 =20
  	kmsg->msg.msg_get_inq =3D 1;
+ 	kmsg->msg.msg_inq =3D -1U;
 -	if (req->flags & REQ_F_APOLL_MULTISHOT)
 +	if (req->flags & REQ_F_APOLL_MULTISHOT) {
  		ret =3D io_recvmsg_multishot(sock, sr, kmsg, flags,
  					   &mshot_finished);
 -	else
 +	} else {
 +		/* disable partial retry for recvmsg with cmsg attached */
 +		if (flags & MSG_WAITALL && !kmsg->msg.msg_controllen)
 +			min_ret =3D iov_iter_count(&kmsg->msg.msg_iter);
 +
  		ret =3D __sys_recvmsg_sock(sock, &kmsg->msg, sr->umsg,
  					 kmsg->uaddr, flags);
 +	}
 =20
  	if (ret < min_ret) {
  		if (ret =3D=3D -EAGAIN && force_nonblock) {

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSZACkACgkQAVBC80lX
0Gxc0wgAixPa1rtWmoFbpvyRB0jZhW1fmPsfJZiVVoVwFQO9Ws9vNqOZdxBJg3vD
GqQHXaXx5O5+SF7QR8uCnPeeFSLXcFidtz1baGu4XOo7rc8BT39Ghjz4dDi4BXTJ
DqSPKhAU3R2fsvbeWnScDn+nMG+DwWuQXX2pMavVuawKyK8/ttsYKX3VxB2swJxz
PmxnoFGwSjZWTLEWejRjRiWJqe2WTiwCDbf7amZwiXUuF7mzAJ8iJan0ZBbzNMwL
gSP45bp0UBWbxlh/Et3MW7K/GuTaQyTdfZsZCyyG7SMT/4ZCfdC3TX73xR7EIWti
aZ/YwNfipXFFziR8pyUhJLQw/SOMeA==
=W4lm
-----END PGP SIGNATURE-----

--Sig_/bOHHKOyCXE1/DXONO1ubTfv--