Skip to content

Commit 61f94d9

Browse files
authored
Merge pull request #837 from ojeda/sync
Sync with v5.19-rc8
2 parents bd36aaf + 95e88c3 commit 61f94d9

File tree

570 files changed

+6847
-3267
lines changed

Some content is hidden

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

570 files changed

+6847
-3267
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,10 @@ S: 48287 Sawleaf
627627
S: Fremont, California 94539
628628
S: USA
629629

630+
N: Tomas Cech
631+
632+
D: arm/palm treo support
633+
630634
N: Florent Chabaud
631635
632636
D: software suspend

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5197,6 +5197,30 @@
51975197

51985198
retain_initrd [RAM] Keep initrd memory after extraction
51995199

5200+
retbleed= [X86] Control mitigation of RETBleed (Arbitrary
5201+
Speculative Code Execution with Return Instructions)
5202+
vulnerability.
5203+
5204+
off - no mitigation
5205+
auto - automatically select a migitation
5206+
auto,nosmt - automatically select a mitigation,
5207+
disabling SMT if necessary for
5208+
the full mitigation (only on Zen1
5209+
and older without STIBP).
5210+
ibpb - mitigate short speculation windows on
5211+
basic block boundaries too. Safe, highest
5212+
perf impact.
5213+
unret - force enable untrained return thunks,
5214+
only effective on AMD f15h-f17h
5215+
based systems.
5216+
unret,nosmt - like unret, will disable SMT when STIBP
5217+
is not available.
5218+
5219+
Selecting 'auto' will choose a mitigation method at run
5220+
time according to the CPU.
5221+
5222+
Not specifying this option is equivalent to retbleed=auto.
5223+
52005224
rfkill.default_state=
52015225
0 "airplane mode". All wifi, bluetooth, wimax, gps, fm,
52025226
etc. communication is blocked by default.
@@ -5568,6 +5592,7 @@
55685592
eibrs - enhanced IBRS
55695593
eibrs,retpoline - enhanced IBRS + Retpolines
55705594
eibrs,lfence - enhanced IBRS + LFENCE
5595+
ibrs - use IBRS to protect kernel
55715596

55725597
Not specifying this option is equivalent to
55735598
spectre_v2=auto.
@@ -5771,6 +5796,24 @@
57715796
expediting. Set to zero to disable automatic
57725797
expediting.
57735798

5799+
srcutree.srcu_max_nodelay [KNL]
5800+
Specifies the number of no-delay instances
5801+
per jiffy for which the SRCU grace period
5802+
worker thread will be rescheduled with zero
5803+
delay. Beyond this limit, worker thread will
5804+
be rescheduled with a sleep delay of one jiffy.
5805+
5806+
srcutree.srcu_max_nodelay_phase [KNL]
5807+
Specifies the per-grace-period phase, number of
5808+
non-sleeping polls of readers. Beyond this limit,
5809+
grace period worker thread will be rescheduled
5810+
with a sleep delay of one jiffy, between each
5811+
rescan of the readers, for a grace period phase.
5812+
5813+
srcutree.srcu_retry_check_delay [KNL]
5814+
Specifies number of microseconds of non-sleeping
5815+
delay between each non-sleeping poll of readers.
5816+
57745817
srcutree.small_contention_lim [KNL]
57755818
Specifies the number of update-side contention
57765819
events per jiffy will be tolerated before

Documentation/core-api/kernel-api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Module Loading
223223
Inter Module support
224224
--------------------
225225

226-
Refer to the file kernel/module.c for more information.
226+
Refer to the files in kernel/module/ for more information.
227227

228228
Hardware Interfaces
229229
===================

Documentation/core-api/symbol-namespaces.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ namespace ``USB_STORAGE``, use::
5151
The corresponding ksymtab entry struct ``kernel_symbol`` will have the member
5252
``namespace`` set accordingly. A symbol that is exported without a namespace will
5353
refer to ``NULL``. There is no default namespace if none is defined. ``modpost``
54-
and kernel/module.c make use the namespace at build time or module load time,
55-
respectively.
54+
and kernel/module/main.c make use the namespace at build time or module load
55+
time, respectively.
5656

5757
2.2 Using the DEFAULT_SYMBOL_NAMESPACE define
5858
=============================================

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ if:
9494
- allwinner,sun8i-a83t-display-engine
9595
- allwinner,sun8i-r40-display-engine
9696
- allwinner,sun9i-a80-display-engine
97+
- allwinner,sun20i-d1-display-engine
9798
- allwinner,sun50i-a64-display-engine
9899

99100
then:

Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Atheros ath9k wireless devices Generic Binding
88

99
maintainers:
10-
- Kalle Valo <[email protected]>
10+
- Toke Høiland-Jørgensen <[email protected]>
1111

1212
description: |
1313
This node provides properties for configuring the ath9k wireless device.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
99
title: Qualcomm Technologies ath11k wireless devices Generic Binding
1010

1111
maintainers:
12-
- Kalle Valo <kvalo@codeaurora.org>
12+
- Kalle Valo <kvalo@kernel.org>
1313

1414
description: |
1515
These are dt entries for Qualcomm Technologies, Inc. IEEE 802.11ax

Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ properties:
2525
- qcom,sc7280-lpass-cpu
2626

2727
reg:
28-
minItems: 2
28+
minItems: 1
2929
maxItems: 6
3030
description: LPAIF core registers
3131

3232
reg-names:
33-
minItems: 2
33+
minItems: 1
3434
maxItems: 6
3535

3636
clocks:
@@ -42,12 +42,12 @@ properties:
4242
maxItems: 10
4343

4444
interrupts:
45-
minItems: 2
45+
minItems: 1
4646
maxItems: 4
4747
description: LPAIF DMA buffer interrupt
4848

4949
interrupt-names:
50-
minItems: 2
50+
minItems: 1
5151
maxItems: 4
5252

5353
qcom,adsp:

Documentation/filesystems/netfs_library.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ through which it can issue requests and negotiate::
301301
void (*issue_read)(struct netfs_io_subrequest *subreq);
302302
bool (*is_still_valid)(struct netfs_io_request *rreq);
303303
int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,
304-
struct folio *folio, void **_fsdata);
304+
struct folio **foliop, void **_fsdata);
305305
void (*done)(struct netfs_io_request *rreq);
306306
};
307307

@@ -381,8 +381,10 @@ The operations are as follows:
381381
allocated/grabbed the folio to be modified to allow the filesystem to flush
382382
conflicting state before allowing it to be modified.
383383

384-
It should return 0 if everything is now fine, -EAGAIN if the folio should be
385-
regrabbed and any other error code to abort the operation.
384+
It may unlock and discard the folio it was given and set the caller's folio
385+
pointer to NULL. It should return 0 if everything is now fine (``*foliop``
386+
left set) or the op should be retried (``*foliop`` cleared) and any other
387+
error code to abort the operation.
386388

387389
* ``done``
388390

Documentation/filesystems/overlayfs.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ overlay filesystem and the value of st_ino for filesystem objects may not be
466466
persistent and could change even while the overlay filesystem is mounted, as
467467
summarized in the `Inode properties`_ table above.
468468

469+
4) "idmapped mounts"
470+
When the upper or lower layers are idmapped mounts overlayfs will be mounted
471+
without support for POSIX Access Control Lists (ACLs). This limitation will
472+
eventually be lifted.
469473

470474
Changes to underlying filesystems
471475
---------------------------------

Documentation/livepatch/module-elf-format.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ module->symtab.
210210
=====================================
211211
Normally, a stripped down copy of a module's symbol table (containing only
212212
"core" symbols) is made available through module->symtab (See layout_symtab()
213-
in kernel/module.c). For livepatch modules, the symbol table copied into memory
214-
on module load must be exactly the same as the symbol table produced when the
215-
patch module was compiled. This is because the relocations in each livepatch
216-
relocation section refer to their respective symbols with their symbol indices,
217-
and the original symbol indices (and thus the symtab ordering) must be
213+
in kernel/module/kallsyms.c). For livepatch modules, the symbol table copied
214+
into memory on module load must be exactly the same as the symbol table produced
215+
when the patch module was compiled. This is because the relocations in each
216+
livepatch relocation section refer to their respective symbols with their symbol
217+
indices, and the original symbol indices (and thus the symtab ordering) must be
218218
preserved in order for apply_relocate_add() to find the right symbol.
219219

220220
For example, take this particular rela from a livepatch module:::

0 commit comments

Comments
 (0)