linux-next: manual merge of the kvm tree with the block tree

linux-next: manual merge of the kvm tree with the block tree

[Stephen Rothwell]

[-- 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 --]

linux-next: manual merge of the kvm tree with the block tree

[Stephen Rothwell]

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

Hi all,

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

  include/linux/mm.h

between commit:

  4003f107fa2e ("mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages")

from the block tree and commit:

  93c5c61d9e58 ("mm/gup: Add FOLL_INTERRUPTIBLE")

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

idiff --cc include/linux/mm.h
index f0eab324102b,3c84f4e48cd7..000000000000
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -2968,7 -2958,7 +2968,8 @@@ struct page *follow_page(struct vm_area
  #define FOLL_SPLIT_PMD	0x20000	/* split huge pmd before returning */
  #define FOLL_PIN	0x40000	/* pages must be released via unpin_user_page */
  #define FOLL_FAST_ONLY	0x80000	/* gup_fast: prevent fall-back to slow gup */
 -#define FOLL_INTERRUPTIBLE  0x100000 /* allow interrupts from generic signals */
 +#define FOLL_PCI_P2PDMA	0x100000 /* allow returning PCI P2PDMA pages */
++#define FOLL_INTERRUPTIBLE  0x200000 /* allow interrupts from generic signals */
  
  /*
   * FOLL_PIN and FOLL_LONGTERM may be used in various combinations with each

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