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

[Mark Brown]

Hi all,

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

  fs/f2fs/file.c

between commit:

  49e9feb15def9 ("f2fs: rename page_count with cache_count")

from the f2fs 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/f2fs/file.c
index 1e693f6028474,bd345615956eb..0000000000000
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -5232,8 -5229,8 +5232,8 @@@ static ssize_t f2fs_dio_read_iter(struc
  	 * the higher-level function iomap_dio_rw() in order to ensure that the
  	 * F2FS_DIO_READ counter will be decremented correctly in all cases.
  	 */
 -	inc_page_count(sbi, F2FS_DIO_READ);
 +	inc_cache_count(sbi, F2FS_DIO_READ);
- 	dio = __iomap_dio_rw(iocb, to, &f2fs_iomap_ops,
+ 	dio = __iomap_dio_rw(iocb, to, f2fs_iomap_next,
  			     &f2fs_iomap_dio_read_ops, 0, NULL, 0);
  	if (IS_ERR_OR_NULL(dio)) {
  		ret = PTR_ERR_OR_ZERO(dio);

Attachment: signature.asc
Description: PGP signature