diff mbox series

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

Message ID 20221215083604.5a920366@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the gfs2 tree with Linus' tree |

Commit Message

Stephen Rothwell Dec. 14, 2022, 9:36 p.m. UTC 
  Hi all,

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

  include/linux/iomap.h

between commit:

  d7b64041164c ("iomap: write iomap validity checks")

from Linus' tree and commit:

  2057bcfa562b ("iomap: Move page_done callback under the folio lock")

from the gfs2 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 include/linux/iomap.h
index 0983dfc9a203,bd6d80453726..000000000000
--- a/include/linux/iomap.h