Subject: linux-next: manual merge of the block tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 28 Jan 2020 11:38:51 +1100

Hi all,

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

  fs/io_uring.c

between commit:

  73e08e711d9c ("Revert "io_uring: only allow submit from owning task"")

from Linus' tree and commit:

  9ef4f124894b ("io_uring: clamp to_submit in io_submit_sqes()")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/io_uring.c
index e54556b0fcc6,82fd87e3a6ca..000000000000
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -5157,7 -6384,12 +6380,6 @@@ SYSCALL_DEFINE6(io_uring_enter, unsigne
  	} else if (to_submit) {
  		struct mm_struct *cur_mm;
  
- 		to_submit = min(to_submit, ctx->sq_entries);
 -		if (current->mm != ctx->sqo_mm ||
 -		    current_cred() != ctx->creds) {
 -			ret = -EPERM;
 -			goto out;
 -		}
 -
  		mutex_lock(&ctx->uring_lock);
  		/* already have mm, so io_submit_sqes() won't try to grab it */
  		cur_mm = ctx->sqo_mm;