diff mbox series

linux-next: manual merge of the f2fs tree with the mm tree

Message ID 20230616102524.73bb5efb@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the f2fs tree with the mm tree |

Commit Message

Stephen Rothwell June 16, 2023, 12:25 a.m. UTC 
  Hi all,

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

  fs/f2fs/file.c

between commit:

  0d625446d0a4 ("backing_dev: remove current->backing_dev_info")

from the mm tree and commit:

  d61812691182 ("f2fs: enable nowait async buffered writes")

from the f2fs 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.

Comments

Christoph Hellwig June 16, 2023, 5:52 a.m. UTC | #1 
The merge looks good to me, thanks.
diff mbox series

Patch

diff --cc fs/f2fs/file.c
index 7134fe8bd008,41e7c2b80f31..000000000000
--- a/fs/f2fs/file.c