Skip to content

Commit 7fcd473

Browse files
committed
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley: "A few late arriving patches that missed the initial pull request. It's mostly bug fixes (the dt-bindings is a fix for the initial pull)" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ufs: core: Remove unused function declaration scsi: target: docs: Remove tcm_mod_builder.py scsi: target: iblock: Quiet bool conversion warning with pr_preempt use scsi: dt-bindings: ufs: qcom: Fix ICE phandle scsi: core: Simplify scsi_cdl_check_cmd() scsi: isci: Fix comment typo scsi: smartpqi: Replace one-element arrays with flexible-array members scsi: target: tcmu: Replace strlcpy() with strscpy() scsi: ncr53c8xx: Replace strlcpy() with strscpy() scsi: lpfc: Fix lpfc_name struct packing
2 parents 84dc5aa + 24033d7 commit 7fcd473

File tree

12 files changed

+32
-706
lines changed

12 files changed

+32
-706
lines changed

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,8 @@ allOf:
194194
# TODO: define clock bindings for qcom,msm8994-ufshc
195195

196196
- if:
197-
properties:
198-
qcom,ice:
199-
maxItems: 1
197+
required:
198+
- qcom,ice
200199
then:
201200
properties:
202201
reg:
@@ -207,10 +206,10 @@ allOf:
207206
else:
208207
properties:
209208
reg:
210-
minItems: 2
209+
minItems: 1
211210
maxItems: 2
212211
clocks:
213-
minItems: 9
212+
minItems: 8
214213
maxItems: 11
215214

216215
unevaluatedProperties: false

Documentation/target/scripts.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
TCM mod builder script
2-
----------------------
3-
4-
.. literalinclude:: tcm_mod_builder.py
5-
:language: perl
6-
71
Target export device script
82
---------------------------
93

0 commit comments

Comments
 (0)