block: add tracepoints for ZBD specific operations

[blktests-ci]

Pull request for series with
subject: block: add tracepoints for ZBD specific operations
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=980492

[blktests-ci]

Upstream branch: 8c2e52e
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: 347e9f5
series: https://patchwork.kernel.org/project/linux-block/list/?series=980492
version: 1

[blktests-ci]

Upstream branch: 89be9a8
series: https://patchwork.kernel.org/project/linux-block/list/?series=982498
version: 3

[blktests-ci]

Upstream branch: 25fae0b
series: https://patchwork.kernel.org/project/linux-block/list/?series=982498
version: 3

[blktests-ci]

Upstream branch: 260f6f4
series: https://patchwork.kernel.org/project/linux-block/list/?series=982498
version: 3

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: blktrace: add zoned block commands to blk_fill_rwbs
Using index info to reconstruct a base tree...
M	include/trace/events/block.h
M	kernel/trace/blktrace.c
Falling back to patching base and 3-way merge...
Auto-merging include/trace/events/block.h
No changes -- Patch already applied.
Applying: block: split blk_zone_update_request_bio into two functions
Using index info to reconstruct a base tree...
M	block/blk-mq.c
M	block/blk-zoned.c
M	block/blk.h
Falling back to patching base and 3-way merge...
Auto-merging block/blk.h
Auto-merging block/blk-zoned.c
CONFLICT (content): Merge conflict in block/blk-zoned.c
Auto-merging block/blk-mq.c
Patch failed at 0002 block: split blk_zone_update_request_bio into two functions'
  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/blk-zoned.c
index ef43aaca49f4,e79e0357d1f1..000000000000
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@@ -1204,7 -1216,6 +1204,10 @@@ void blk_zone_append_update_request_bio
  	 * lookup the zone write plug.
  	 */
  	bio->bi_iter.bi_sector = rq->__sector;
++<<<<<<< HEAD
 +	trace_blk_zone_append_update_request_bio(rq);
++=======
++>>>>>>> block: split blk_zone_update_request_bio into two functions
  }
  
  void blk_zone_write_plug_bio_endio(struct bio *bio)