zloop fixes and improvements

[blktests-ci]

Pull request for series with
subject: zloop fixes and improvements
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1023830

[blktests-ci]

Upstream branch: 6da43bb
series: https://patchwork.kernel.org/project/linux-block/list/?series=1023830
version: 1

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: zloop: make the write pointer of full zones invalid
Using index info to reconstruct a base tree...
M	drivers/block/zloop.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/zloop.c
CONFLICT (content): Merge conflict in drivers/block/zloop.c
Patch failed at 0001 zloop: make the write pointer of full zones invalid'
  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 drivers/block/zloop.c
index 3f50321aa4a7,a975b1d07f1c..000000000000
--- a/drivers/block/zloop.c
+++ b/drivers/block/zloop.c
@@@ -472,19 -428,15 +472,27 @@@ static void zloop_rw(struct zloop_cmd *
  			zone->cond = BLK_ZONE_COND_IMP_OPEN;
  
  		/*
 -		 * Advance the write pointer of sequential zones. If the write
 -		 * fails, the wp position will be corrected when the next I/O
 -		 * copmpletes.
 +		 * Advance the write pointer, unless ordered zone append is in
 +		 * use. If the write fails, the write pointer position will be
 +		 * corrected when the next I/O starts execution.
  		 */
++<<<<<<< HEAD
 +		if (!is_append || !zlo->ordered_zone_append) {
 +			zone->wp += nr_sectors;
 +			if (zone->wp == zone_end) {
 +				zone->cond = BLK_ZONE_COND_FULL;
 +				zone->wp = ULLONG_MAX;
 +			}
 +		}
 +
 +		spin_unlock_irqrestore(&zone->wp_lock, flags);
++=======
+ 		zone->wp += nr_sectors;
+ 		if (zone->wp == zone_end) {
+ 			zone->cond = BLK_ZONE_COND_FULL;
+ 			zone->wp = ULLONG_MAX;
+ 		}
++>>>>>>> zloop: make the write pointer of full zones invalid
  	}
  
  	rq_for_each_bvec(tmp, rq, rq_iter)

[blktests-ci]

At least one diff in series https://patchwork.kernel.org/project/linux-block/list/?series=1023830 irrelevant now for [{'archived': False, 'project': 241}] search patterns