public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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
Date: Wed, 20 Dec 2023 13:52:51 +1100	[thread overview]
Message-ID: <20231220135251.67a61536@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]

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_getfd_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.

-- 
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 = 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 = 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 = NULL;
 -	} else {
 -		ctx->ring_sock->file = file;
 -	}
 -#endif
 -	return file;
  }
  
  static __cold int io_uring_create(unsigned entries, struct io_uring_params *p,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2023-12-20  2:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-20  2:52 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-01  0:08 linux-next: manual merge of the kvm tree with the block tree Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231220135251.67a61536@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=axboe@kernel$(echo .)dk \
    --cc=kvm@vger$(echo .)kernel.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=pbonzini@redhat$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox