Received-SPF: pass (google.com: domain of linux-kernel+bounces-6302-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 20 Dec 2023 13:52:51 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>, 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 kvm tree with the block tree
Message-ID: <20231220135251.67a61536@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Se2yPS5HSeJnu+2cA8zfccr";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Se2yPS5HSeJnu+2cA8zfccr
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  io_uring/io_uring.c

between commit:

  6e5e6d274956 ("io_uring: drop any code related to SCM_RIGHTS")

from the block tree and commit:

  4f0b9194bc11 ("fs: Rename anon_inode_getfile_secure() and anon_inode_getf=
d_secure()")

from the kvm 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/io_uring.c
index bc0dc1ca9f1e,db3f545ddcac..000000000000
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@@ -3777,8 -3867,28 +3777,9 @@@ static int io_uring_install_fd(struct f
   */
  static struct file *io_uring_get_file(struct io_ring_ctx *ctx)
  {
- 	return anon_inode_getfile_secure("[io_uring]", &io_uring_fops, ctx,
 -	struct file *file;
 -#if defined(CONFIG_UNIX)
 -	int ret;
 -
 -	ret =3D sock_create_kern(&init_net, PF_UNIX, SOCK_RAW, IPPROTO_IP,
 -				&ctx->ring_sock);
 -	if (ret)
 -		return ERR_PTR(ret);
 -#endif
 -
+ 	/* Create a new inode so that the LSM can block the creation.  */
 -	file =3D anon_inode_create_getfile("[io_uring]", &io_uring_fops, ctx,
++	return anon_inode_create_getfile("[io_uring]", &io_uring_fops, ctx,
  					 O_RDWR | O_CLOEXEC, NULL);
 -#if defined(CONFIG_UNIX)
 -	if (IS_ERR(file)) {
 -		sock_release(ctx->ring_sock);
 -		ctx->ring_sock =3D NULL;
 -	} else {
 -		ctx->ring_sock->file =3D file;
 -	}
 -#endif
 -	return file;
  }
 =20
  static __cold int io_uring_create(unsigned entries, struct io_uring_param=
s *p,

--Sig_/Se2yPS5HSeJnu+2cA8zfccr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWCVwMACgkQAVBC80lX
0GyU2gf+OY5SIJaF+IjNQMWUt2zmqt/rolbsnDZUnWJ3l1iiq30lDQtlVOfbZP7j
c3fu65tRA1OAJjALfvNaTCppB5iR7e4uN9tFkYt1Xu0fMHvd8ZAqrpj4mffuGVx6
PgMwRBSqAjU3dzEWslOJJqJoyJ7EmvqrZ6Yek3PX6iu46jvEn3wZdJlfJOTODSJg
0ufHB7jPBPmpUN4N44YgpJYHR/ULVFC7cyxFE0Gl+E7JWrC/yD+cKCyX9rRDIE2r
ZekKllT7ApCq6iroR/73u1CX5xwRW7EGXCMcJ8xNU65cHqaEjZrY1nLlHhglmJP+
Yf/nmoGi4DJ7JOuD/8u8chs+D8o4lw==
=dNsd
-----END PGP SIGNATURE-----

--Sig_/Se2yPS5HSeJnu+2cA8zfccr--