Skip to content

Commit c5e51b3

Browse files
committed
Merge tag 'v5.18-rc5' into sync
Linux 5.18-rc5 Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
2 parents 426f7e4 + 672c0c5 commit c5e51b3

File tree

1,035 files changed

+8377
-5699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,035 files changed

+8377
-5699
lines changed

Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Description:
116116
<value>[ForceIf:<attribute>=<value>]
117117
<value>[ForceIfNot:<attribute>=<value>]
118118

119-
For example:
119+
For example::
120120

121121
LegacyOrom/dell_value_modifier has value:
122122
Disabled[ForceIf:SecureBoot=Enabled]
@@ -212,7 +212,7 @@ Description:
212212
the next boot.
213213

214214
Lenovo specific class extensions
215-
------------------------------
215+
--------------------------------
216216

217217
On Lenovo systems the following additional settings are available:
218218

@@ -246,9 +246,7 @@ Description:
246246
that is being referenced (e.g hdd0, hdd1 etc)
247247
This attribute defaults to device 0.
248248

249-
certificate:
250-
signature:
251-
save_signature:
249+
certificate, signature, save_signature:
252250
These attributes are used for certificate based authentication. This is
253251
used in conjunction with a signing server as an alternative to password
254252
based authentication.
@@ -257,22 +255,27 @@ Description:
257255
The attributes can be displayed to check the stored value.
258256

259257
Some usage examples:
260-
Installing a certificate to enable feature:
261-
echo <supervisor password > authentication/Admin/current_password
262-
echo <signed certificate> > authentication/Admin/certificate
263258

264-
Updating the installed certificate:
265-
echo <signature> > authentication/Admin/signature
266-
echo <signed certificate> > authentication/Admin/certificate
259+
Installing a certificate to enable feature::
260+
261+
echo "supervisor password" > authentication/Admin/current_password
262+
echo "signed certificate" > authentication/Admin/certificate
263+
264+
Updating the installed certificate::
265+
266+
echo "signature" > authentication/Admin/signature
267+
echo "signed certificate" > authentication/Admin/certificate
267268

268-
Removing the installed certificate:
269-
echo <signature> > authentication/Admin/signature
270-
echo '' > authentication/Admin/certificate
269+
Removing the installed certificate::
271270

272-
Changing a BIOS setting:
273-
echo <signature> > authentication/Admin/signature
274-
echo <save signature> > authentication/Admin/save_signature
275-
echo Enable > attribute/PasswordBeep/current_value
271+
echo "signature" > authentication/Admin/signature
272+
echo "" > authentication/Admin/certificate
273+
274+
Changing a BIOS setting::
275+
276+
echo "signature" > authentication/Admin/signature
277+
echo "save signature" > authentication/Admin/save_signature
278+
echo Enable > attribute/PasswordBeep/current_value
276279

277280
You cannot enable certificate authentication if a supervisor password
278281
has not been set.
@@ -288,9 +291,10 @@ Description:
288291
certificate_to_password:
289292
Write only attribute used to switch from certificate based authentication
290293
back to password based.
291-
Usage:
292-
echo <signature> > authentication/Admin/signature
293-
echo <password> > authentication/Admin/certificate_to_password
294+
Usage::
295+
296+
echo "signature" > authentication/Admin/signature
297+
echo "password" > authentication/Admin/certificate_to_password
294298

295299

296300
What: /sys/class/firmware-attributes/*/attributes/pending_reboot
@@ -345,7 +349,7 @@ Description:
345349

346350
# echo "factory" > /sys/class/firmware-attributes/*/device/attributes/reset_bios
347351
# cat /sys/class/firmware-attributes/*/device/attributes/reset_bios
348-
# builtinsafe lastknowngood [factory] custom
352+
builtinsafe lastknowngood [factory] custom
349353

350354
Note that any changes to this attribute requires a reboot
351355
for changes to take effect.

Documentation/ABI/testing/sysfs-driver-intel_sdsi

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@ Description:
1313
Should the operation fail, one of the following error codes
1414
may be returned:
1515

16+
========== =====
1617
Error Code Cause
17-
---------- -----
18-
EIO General mailbox failure. Log may indicate cause.
19-
EBUSY Mailbox is owned by another agent.
20-
EPERM SDSI capability is not enabled in hardware.
21-
EPROTO Failure in mailbox protocol detected by driver.
18+
========== =====
19+
EIO General mailbox failure. Log may indicate cause.
20+
EBUSY Mailbox is owned by another agent.
21+
EPERM SDSI capability is not enabled in hardware.
22+
EPROTO Failure in mailbox protocol detected by driver.
2223
See log for details.
23-
EOVERFLOW For provision commands, the size of the data
24+
EOVERFLOW For provision commands, the size of the data
2425
exceeds what may be written.
25-
ESPIPE Seeking is not allowed.
26-
ETIMEDOUT Failure to complete mailbox transaction in time.
26+
ESPIPE Seeking is not allowed.
27+
ETIMEDOUT Failure to complete mailbox transaction in time.
28+
========== =====
2729

2830
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/guid
2931
Date: Feb 2022

Documentation/ABI/testing/sysfs-fs-erofs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ Description: Shows all enabled kernel features.
99
What: /sys/fs/erofs/<disk>/sync_decompress
1010
Date: November 2021
1111
Contact: "Huang Jianan" <huangjianan@oppo.com>
12-
Description: Control strategy of sync decompression
12+
Description: Control strategy of sync decompression:
13+
1314
- 0 (default, auto): enable for readpage, and enable for
14-
readahead on atomic contexts only,
15+
readahead on atomic contexts only.
1516
- 1 (force on): enable for readpage and readahead.
1617
- 2 (force off): disable for all situations.

Documentation/arm64/memory-tagging-extension.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ Core dump support
228228
-----------------
229229

230230
The allocation tags for user memory mapped with ``PROT_MTE`` are dumped
231-
in the core file as additional ``PT_ARM_MEMTAG_MTE`` segments. The
231+
in the core file as additional ``PT_AARCH64_MEMTAG_MTE`` segments. The
232232
program header for such segment is defined as:
233233

234-
:``p_type``: ``PT_ARM_MEMTAG_MTE``
234+
:``p_type``: ``PT_AARCH64_MEMTAG_MTE``
235235
:``p_flags``: 0
236236
:``p_offset``: segment file offset
237237
:``p_vaddr``: segment virtual address, same as the corresponding

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ maintainers:
1313
properties:
1414
compatible:
1515
enum:
16-
- nvidia,tegra20-pmc
1716
- nvidia,tegra20-pmc
1817
- nvidia,tegra30-pmc
1918
- nvidia,tegra114-pmc

Documentation/devicetree/bindings/bus/ti-sysc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434
oneOf:
3535
- items:
3636
- enum:
37-
- ti,sysc-omap2
3837
- ti,sysc-omap2
3938
- ti,sysc-omap4
4039
- ti,sysc-omap4-simple

Documentation/devicetree/bindings/clock/microchip,mpfs.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@ properties:
2222
const: microchip,mpfs-clkcfg
2323

2424
reg:
25-
maxItems: 1
25+
items:
26+
- description: |
27+
clock config registers:
28+
These registers contain enable, reset & divider tables for the, cpu,
29+
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
30+
for the peripheral clocks.
31+
- description: |
32+
mss pll dri registers:
33+
Block of registers responsible for dynamic reconfiguration of the mss
34+
pll
2635
2736
clocks:
2837
maxItems: 1
@@ -51,7 +60,7 @@ examples:
5160
#size-cells = <2>;
5261
clkcfg: clock-controller@20002000 {
5362
compatible = "microchip,mpfs-clkcfg";
54-
reg = <0x0 0x20002000 0x0 0x1000>;
63+
reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
5564
clocks = <&ref>;
5665
#clock-cells = <1>;
5766
};

Documentation/devicetree/bindings/clock/samsung,exynos-audss-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung Exynos SoC Audio SubSystem clock controller
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

Documentation/devicetree/bindings/clock/samsung,exynos-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung Exynos SoC clock controller
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

Documentation/devicetree/bindings/clock/samsung,exynos-ext-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung SoC external/osc/XXTI/XusbXTI clock
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

0 commit comments

Comments
 (0)