fix NVMe multipath partition diskstats

[blktests-ci-block-trial]

Pull request for series with
subject: fix NVMe multipath partition diskstats
version: 2
url: http://redsun45:8000/project/linux-block/list/?series=656

[blktests-ci-block-trial]

Upstream branch: 8421340
series: http://redsun45:8000/project/linux-block/list/?series=656
version: 2

Pull request is NOT updated. Failed to apply http://redsun45:8000/project/linux-block/list/?series=656
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: block: scan partitions for hidden disks
Using index info to reconstruct a base tree...
M	block/genhd.c
M	include/linux/blkdev.h
Falling back to patching base and 3-way merge...
Auto-merging block/genhd.c
CONFLICT (content): Merge conflict in block/genhd.c
Auto-merging include/linux/blkdev.h
Patch failed at 0001 block: scan partitions for hidden disks'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc block/genhd.c
index f1990c7cdfb9,05301ee5d4ca..000000000000
--- a/block/genhd.c
+++ b/block/genhd.c
@@@ -406,11 -406,15 +406,22 @@@ static void add_disk_final(struct gendi
  {
  	struct device *ddev = disk_to_dev(disk);
  
+ 	/* Make sure the first partition scan will be proceed */
+ 	if (get_capacity(disk) && disk_has_partscan(disk))
+ 		set_bit(GD_NEED_PART_SCAN, &disk->state);
+ 
+ 	bdev_add(disk->part0, ddev->devt);
+ 	if (get_capacity(disk))
+ 		disk_scan_partitions(disk, BLK_OPEN_READ);
+ 
  	if (!(disk->flags & GENHD_FL_HIDDEN)) {
++<<<<<<< HEAD
 +		bdev_add(disk->part0, ddev->devt);
 +		if (get_capacity(disk))
 +			disk_scan_partitions(disk, BLK_OPEN_READ);
 +
++=======
++>>>>>>> block: scan partitions for hidden disks
  		/*
  		 * Announce the disk and partitions after all partitions are
  		 * created. (for hidden disks uevents remain suppressed forever)