linux-next: manual merge of the vfs-brauner tree with the ext4 tree

[Mark Brown]

Hi all,

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

  fs/ext4/ext4.h

between commit:

  8dccd9f0a1a93 ("ext4: implement buffered write path using iomap")

from the ext4 tree and commit:

  d874f8060847c ("iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops")

from the vfs-brauner 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 --cc fs/ext4/ext4.h
index e6db5a687a5fe,1576c703d96d1..0000000000000
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -4105,11 -4041,8 +4106,11 @@@ static inline void ext4_clear_io_unwrit
  		io_end->flag &= ~EXT4_IO_END_UNWRITTEN;
  }
  
- extern const struct iomap_ops ext4_iomap_ops;
- extern const struct iomap_ops ext4_iomap_report_ops;
- extern const struct iomap_ops ext4_iomap_buffered_write_ops;
- extern const struct iomap_ops ext4_iomap_buffered_da_write_ops;
+ DECLARE_IOMAP_ITER_NEXT(ext4_iomap_next);
+ DECLARE_IOMAP_ITER_NEXT(ext4_iomap_next_report);
++DECLARE_IOMAP_ITER_NEXT(ext4_iomap_buffered_write_next);
++DECLARE_IOMAP_ITER_NEXT(ext4_iomap_buffered_da_write_next);
 +extern const struct iomap_write_ops ext4_iomap_write_ops;
  
  int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
  		unsigned flags, struct iomap *iomap, struct iomap *srcmap);

Attachment: signature.asc
Description: PGP signature