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

[Stephen Rothwell]

Hi all,

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

  fs/f2fs/super.c

between commit:

  51bf8d3c8199 ("f2fs: don't reopen the main block device in f2fs_scan_devices")

from the f2fs tree and commit:

  2ea6f68932f7 ("fs: use the super_block as holder when mounting file systems")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/super.c
index a067466a694c,aa1f9a3a8037..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1561,8 -1561,7 +1561,8 @@@ static void destroy_device_list(struct 
  	int i;
  
  	for (i = 0; i < sbi->s_ndevs; i++) {
 -		blkdev_put(FDEV(i).bdev, sbi->sb);
 +		if (i > 0)
- 			blkdev_put(FDEV(i).bdev, sbi->sb->s_type);
++			blkdev_put(FDEV(i).bdev, sbi->sb);
  #ifdef CONFIG_BLK_DEV_ZONED
  		kvfree(FDEV(i).blkz_seq);
  #endif
@@@ -4218,9 -4215,9 +4218,9 @@@ static int f2fs_scan_devices(struct f2f
  				FDEV(i).end_blk = FDEV(i).start_blk +
  					(FDEV(i).total_segments <<
  					sbi->log_blocks_per_seg) - 1;
 +				FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
- 					mode, sbi->sb->s_type, NULL);
++					mode, sbi->sb, NULL);
  			}
 -			FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode,
 -							  sbi->sb, NULL);
  		}
  		if (IS_ERR(FDEV(i).bdev))
  			return PTR_ERR(FDEV(i).bdev);

Attachment: pgp6B5sBLzkhD.pgp
Description: OpenPGP digital signature