Cleanup patches

[blktests-ci]

Pull request for series with
subject: Cleanup patches
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1048407

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

Upstream branch: 05f7e89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048407
version: 1

[blktests-ci]

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

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: block: cleanup queue limit features definition
Using index info to reconstruct a base tree...
M	include/linux/blkdev.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/blkdev.h
No changes -- Patch already applied.
Applying: block: introduce blk_queue_rot()
Using index info to reconstruct a base tree...
M	block/bfq-iosched.c
M	block/blk-iocost.c
M	block/blk-iolatency.c
M	block/blk-wbt.c
M	include/linux/blkdev.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/blkdev.h
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Auto-merging block/blk-wbt.c
CONFLICT (content): Merge conflict in block/blk-wbt.c
Auto-merging block/bfq-iosched.c
Patch failed at 0002 block: introduce blk_queue_rot()'
  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-wbt.c
index 1415f2bf8611,8e025834f2fb..000000000000
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@@ -803,6 -750,19 +803,22 @@@ static u64 wbt_default_latency_nsec(str
  	if (blk_queue_rot(q))
  		return 75000000ULL;
  	return 2000000ULL;
++<<<<<<< HEAD
++=======
+ }
+ 
+ static int wbt_data_dir(const struct request *rq)
+ {
+ 	const enum req_op op = req_op(rq);
+ 
+ 	if (op == REQ_OP_READ)
+ 		return READ;
+ 	else if (op_is_write(op))
+ 		return WRITE;
+ 
+ 	/* don't account */
+ 	return -1;
++>>>>>>> block: introduce blk_queue_rot()
  }
  
  static void wbt_queue_depth_changed(struct rq_qos *rqos)
diff --cc include/linux/blkdev.h
index 99ef8cd7673c,1e5b5547929f..000000000000
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -1462,14 -1461,9 +1462,18 @@@ bdev_write_zeroes_unmap_sectors(struct 
  	return bdev_limits(bdev)->max_wzeroes_unmap_sectors;
  }
  
 +static inline bool bdev_rot(struct block_device *bdev)
 +{
 +	return blk_queue_rot(bdev_get_queue(bdev));
 +}
 +
  static inline bool bdev_nonrot(struct block_device *bdev)
  {
++<<<<<<< HEAD
 +	return !bdev_rot(bdev);
++=======
+ 	return !blk_queue_rot(bdev_get_queue(bdev));
++>>>>>>> block: introduce blk_queue_rot()
  }
  
  static inline bool bdev_synchronous(struct block_device *bdev)