[lkml]   [2022]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the block tree with Linus' tree
Hi all,

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


between commit:

91482864768a ("io_uring: fix multishot accept request leaks")

from Linus' tree and commits:

01661287389d ("io_uring: revert "io_uring fix multishot accept ordering"")
6488182c989a ("io_uring: remove allow_overflow parameter")

from the block tree.

I fixed it up (I just used the latter version where they conflicted) 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2022-11-21 03:47    [W:0.032 / U:10.848 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site