block: make some queue limits checks more robust

[blktests-ci]

Pull request for series with
subject: block: make some queue limits checks more robust
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=984658

[blktests-ci]

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

[blktests-ci]

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

[blktests-ci]

Upstream branch: 14bed9b
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

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

[blktests-ci]

Upstream branch: d6084bb
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 831462f
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: c93529a
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: cbbf0a7
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 6a68cec
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: d2eedaa
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 6e64f45
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: bec0771
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 3781648
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 0227b49
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 71a0760
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

[blktests-ci]

Upstream branch: 2988dfe
series: https://patchwork.kernel.org/project/linux-block/list/?series=986660
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: block: avoid possible overflow for chunk_sectors check in blk_stack_limits()
Using index info to reconstruct a base tree...
M	block/blk-settings.c
Falling back to patching base and 3-way merge...
Auto-merging block/blk-settings.c
No changes -- Patch already applied.
Applying: block: Enforce power-of-2 physical block size
Using index info to reconstruct a base tree...
M	block/blk-settings.c
Falling back to patching base and 3-way merge...
Auto-merging block/blk-settings.c
CONFLICT (content): Merge conflict in block/blk-settings.c
Patch failed at 0002 block: Enforce power-of-2 physical block size'
  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-settings.c
index 07874e9b609f,5ae0a253e43f..000000000000
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -320,9 -272,9 +320,13 @@@ int blk_validate_limits(struct queue_li
  		pr_warn("Invalid logical block size (%d)\n", lim->logical_block_size);
  		return -EINVAL;
  	}
 -	if (lim->physical_block_size < lim->logical_block_size)
 +	if (lim->physical_block_size < lim->logical_block_size) {
  		lim->physical_block_size = lim->logical_block_size;
++<<<<<<< HEAD
 +	} else if (!is_power_of_2(lim->physical_block_size)) {
++=======
+ 	else if (!is_power_of_2(lim->physical_block_size)) {
++>>>>>>> block: Enforce power-of-2 physical block size
  		pr_warn("Invalid physical block size (%d)\n", lim->physical_block_size);
  		return -EINVAL;
  	}