diff mbox series

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

Message ID 20231220135251.67a61536@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the kvm tree with the block tree |

Commit Message

Stephen Rothwell Dec. 20, 2023, 2:52 a.m. UTC 
  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.
diff mbox series

Patch

diff --cc io_uring/io_uring.c
index bc0dc1ca9f1e,db3f545ddcac..000000000000
--- a/io_uring/io_uring.c