Hi all,

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

  include/linux/iomap.h

between commit:

  f356603d90ebc ("iomap: introduce IOMAP_F_ZERO_TAIL flag")

from the extfat tree and commit:

  198c3b90e600d ("iomap: introduce IOMAP_F_ZERO_TAIL flag")
  9f54b6894dec2 ("iomap: introduce IOMAP_F_FSVERITY and teach writeback to handle fsverity")

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 --combined include/linux/iomap.h
index cea6bbc97b6ef,3582ed1fe2361..0000000000000
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -91,6 -91,14 +91,14 @@@ struct vm_fault
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  #define IOMAP_F_ZERO_TAIL	(1U << 10)
  
+ /*
+  * Indicates reads and writes of fsverity metadata.
+  *
+  * Fsverity metadata is stored after the regular file data and thus beyond
+  * i_size.
+  */
+ #define IOMAP_F_FSVERITY	(1U << 11)
+ 
  /*
   * Flag reserved for file system specific usage
   */
@@@ -345,6 -353,9 +353,9 @@@ static inline bool iomap_want_unshare_i
  ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from,
  		const struct iomap_ops *ops,
  		const struct iomap_write_ops *write_ops, void *private);
+ int iomap_fsverity_write(struct file *file, loff_t pos, size_t length,
+ 		const void *buf, const struct iomap_ops *ops,
+ 		const struct iomap_write_ops *write_ops);
  void iomap_read_folio(const struct iomap_ops *ops,
  		struct iomap_read_folio_ctx *ctx, void *private);
  void iomap_readahead(const struct iomap_ops *ops,
@@@ -421,6 -432,7 +432,7 @@@ struct iomap_ioend 
  	loff_t			io_offset;	/* offset in the file */
  	sector_t		io_sector;	/* start sector of ioend */
  	void			*io_private;	/* file system private data */
+ 	struct fsverity_info	*io_vi;		/* fsverity info */
  	struct bio		io_bio;		/* MUST BE LAST! */
  };
  
@@@ -495,6 -507,7 +507,7 @@@ struct iomap_read_folio_ctx 
  	struct readahead_control *rac;
  	void			*read_ctx;
  	loff_t			read_ctx_file_offset;
+ 	struct fsverity_info	*vi;
  };
  
  struct iomap_read_ops {