diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 23:13:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 23:13:47 +0100 |
| commit | b5d6adf32744ef61b5ed065152baff796b55fd2c (patch) | |
| tree | bc27109fcdf495bb9d6c94d6a1487e3aeb006bc1 /Documentation | |
| parent | 90aadaa2537394eaf9d6331ce201bb8894a5897b (diff) | |
| parent | 1747233ee1af0b89d39995ad09506cbadd3d3e50 (diff) | |
| download | linux-next-history-b5d6adf32744ef61b5ed065152baff796b55fd2c.tar.gz | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Diffstat (limited to 'Documentation')
4 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/ufs/qcom,sa8255p-ufshc.yaml b/Documentation/devicetree/bindings/ufs/qcom,sa8255p-ufshc.yaml index 75fae9f1eba7e..db165a235cb6d 100644 --- a/Documentation/devicetree/bindings/ufs/qcom,sa8255p-ufshc.yaml +++ b/Documentation/devicetree/bindings/ufs/qcom,sa8255p-ufshc.yaml @@ -11,7 +11,11 @@ maintainers: properties: compatible: - const: qcom,sa8255p-ufshc + oneOf: + - const: qcom,sa8255p-ufshc + - items: + - const: qcom,sa8797p-ufshc + - const: qcom,sa8255p-ufshc reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml b/Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml index f28641c6e68fe..900d93b675cdf 100644 --- a/Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml +++ b/Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml @@ -17,6 +17,7 @@ select: enum: - qcom,eliza-ufshc - qcom,kaanapali-ufshc + - qcom,nord-ufshc - qcom,sm8650-ufshc - qcom,sm8750-ufshc required: @@ -28,6 +29,7 @@ properties: - enum: - qcom,eliza-ufshc - qcom,kaanapali-ufshc + - qcom,nord-ufshc - qcom,sm8650-ufshc - qcom,sm8750-ufshc - const: qcom,ufshc @@ -74,6 +76,7 @@ allOf: contains: enum: - qcom,eliza-ufshc + - qcom,nord-ufshc then: properties: reg: diff --git a/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml b/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml index a7eb7ad85a94e..710ce493f3b67 100644 --- a/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml +++ b/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml @@ -19,6 +19,7 @@ properties: - samsung,exynos7-ufs - samsung,exynosautov9-ufs - samsung,exynosautov9-ufs-vh + - samsung,exynosautov920-ufs - tesla,fsd-ufs reg: diff --git a/Documentation/scsi/st.rst b/Documentation/scsi/st.rst index b4a092faa9c82..539ff06daf5e9 100644 --- a/Documentation/scsi/st.rst +++ b/Documentation/scsi/st.rst @@ -93,7 +93,7 @@ optionally written. In both cases end of data is signified by returning zero bytes for two consecutive reads. Writing filemarks without the immediate bit set in the SCSI command block acts -as a synchronization point, i.e., all remaining data form the drive buffers is +as a synchronization point, i.e., all remaining data from the drive buffers is written to tape before the command returns. This makes sure that write errors are caught at that point, but this takes time. In some applications, several consecutive files must be written fast. The MTWEOFI operation can be used to |