virtio-blk: use little-endian types for the zoned fields

[blktests-ci]

Pull request for series with
subject: virtio-blk: use little-endian types for the zoned fields
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1112999

[blktests-ci]

Upstream branch: 5c7804e
series: https://patchwork.kernel.org/project/linux-block/list/?series=1112999
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1112999
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: virtio-blk: use little-endian types for the zoned fields
Using index info to reconstruct a base tree...
M	drivers/block/virtio_blk.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/virtio_blk.c
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
Patch failed at 0001 virtio-blk: use little-endian types for the zoned fields
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc drivers/block/virtio_blk.c
index 32bf3ba07a9d,5532cfbde7bf..000000000000
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -687,10 -685,7 +685,14 @@@ static int virtblk_report_zones(struct 
  		if (ret)
  			goto fail_report;
  
++<<<<<<< HEAD
 +		nz = min_t(u64, virtio64_to_cpu(vblk->vdev, report->nr_zones),
 +			   nr_zones);
 +		nz = min_t(u64, nz,
 +			   (buflen - sizeof(*report)) / sizeof(report->zones[0]));
++=======
+ 		nz = min_t(u64, le64_to_cpu(report->nr_zones), nr_zones);
++>>>>>>> virtio-blk: use little-endian types for the zoned fields
  		if (!nz)
  			break;