Skip to content

Commit a6f844d

Browse files
committed
Merge tag 'v5.18' into rdma.git for-next
Following patches have dependencies. Resolve the merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names for the fs functions following linux-next: https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2 parents b599b31 + 4b0986a commit a6f844d

1,795 files changed

Lines changed: 17889 additions & 11488 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
4545
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4646
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
4747
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
48+
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
4849
Andy Adamson <andros@citi.umich.edu>
4950
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
5051
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
@@ -204,6 +205,7 @@ Juha Yrjola <at solidboot.com>
204205
Juha Yrjola <juha.yrjola@nokia.com>
205206
Juha Yrjola <juha.yrjola@solidboot.com>
206207
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
208+
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
207209
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
208210
Kay Sievers <kay.sievers@vrfy.org>
209211
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
@@ -249,6 +251,7 @@ Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
249251
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
250252
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
251253
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
254+
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
252255
Mathieu Othacehe <m.othacehe@gmail.com>
253256
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
254257
Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -391,6 +394,10 @@ Uwe Kleine-König <ukleinek@strlen.de>
391394
Uwe Kleine-König <ukl@pengutronix.de>
392395
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
393396
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
397+
Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>
398+
Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
399+
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
400+
Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
394401
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
395402
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
396403
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

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/arm64/silicon-errata.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ stable kernels.
189189
+----------------+-----------------+-----------------+-----------------------------+
190190
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
191191
+----------------+-----------------+-----------------+-----------------------------+
192+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1286807 |
193+
+----------------+-----------------+-----------------+-----------------------------+
194+
192195
+----------------+-----------------+-----------------+-----------------------------+
193196
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
194197
+----------------+-----------------+-----------------+-----------------------------+

Documentation/dev-tools/kunit/start.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@ or ``VFAT_FS``. To run ``FAT_KUNIT_TEST``, the ``.kunitconfig`` has:
4141
CONFIG_MSDOS_FS=y
4242
CONFIG_FAT_KUNIT_TEST=y
4343
44-
1. A good starting point for the ``.kunitconfig``, is the KUnit default
45-
config. Run the command:
44+
1. A good starting point for the ``.kunitconfig`` is the KUnit default config.
45+
You can generate it by running:
4646

4747
.. code-block:: bash
4848
4949
cd $PATH_TO_LINUX_REPO
50-
cp tools/testing/kunit/configs/default.config .kunitconfig
50+
tools/testing/kunit/kunit.py config
51+
cat .kunit/.kunitconfig
52+
53+
.. note ::
54+
``.kunitconfig`` lives in the ``--build_dir`` used by kunit.py, which is
55+
``.kunit`` by default.
5156
5257
.. note ::
5358
You may want to remove CONFIG_KUNIT_ALL_TESTS from the ``.kunitconfig`` as

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/imx8m-clock.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ allOf:
5555
then:
5656
properties:
5757
clocks:
58-
minItems: 7
59-
maxItems: 7
6058
items:
6159
- description: 32k osc
6260
- description: 25m osc
@@ -66,8 +64,6 @@ allOf:
6664
- description: ext3 clock input
6765
- description: ext4 clock input
6866
clock-names:
69-
minItems: 7
70-
maxItems: 7
7167
items:
7268
- const: ckil
7369
- const: osc_25m

0 commit comments

Comments
 (0)