linux-next: manual merge of the device-mapper tree with the block tree

[Stephen Rothwell]

Hi all,

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

  drivers/md/dm-zoned-metadata.c

between commit:

  c64644ce363b ("block: remove the error_sector argument to blkdev_issue_flush")

from the block tree and commit:

  bf28a3ba0986 ("dm zoned: store device in struct dmz_sb")

from the device-mapper 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 drivers/md/dm-zoned-metadata.c
index bf2245370305,db0dc2b5d44d..000000000000
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@@ -659,9 -816,10 +816,10 @@@ static int dmz_write_sb(struct dmz_meta
        sb->crc = 0;
        sb->crc = cpu_to_le32(crc32_le(sb_gen, (unsigned char *)sb, 
DMZ_BLOCK_SIZE));
  
-       ret = dmz_rdwr_block(zmd, REQ_OP_WRITE, block, mblk->page);
+       ret = dmz_rdwr_block(dev, REQ_OP_WRITE, zmd->sb[set].block,
+                            mblk->page);
        if (ret == 0)
-               ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
 -              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO, NULL);
++              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
  
        return ret;
  }
@@@ -703,7 -862,7 +862,7 @@@ static int dmz_write_dirty_mblocks(stru
  
        /* Flush drive cache (this will also sync data) */
        if (ret == 0)
-               ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
 -              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO, NULL);
++              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
  
        return ret;
  }
@@@ -772,7 -933,7 +933,7 @@@ int dmz_flush_metadata(struct dmz_metad
  
        /* If there are no dirty metadata blocks, just flush the device cache */
        if (list_empty(&write_list)) {
-               ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
 -              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO, NULL);
++              ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
                goto err;
        }
  

pgpSZHCh8TIRK.pgp
Description: OpenPGP digital signature