Skip to content

Commit fc4378b

Browse files
committed
Merge tag 'spi-mem-dtr-2' into nand/next
spi: Support DTR in spi-mem Changes to support DTR with spi-mem.
2 parents d0b806f + e896c04 commit fc4378b

File tree

2,518 files changed

+21895
-14144
lines changed

Some content is hidden

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

2,518 files changed

+21895
-14144
lines changed

.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Martin Kepplinger <[email protected]> <[email protected]>
435435
436436
437437
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
438+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439439
440440
441441
@@ -735,6 +735,7 @@ Wolfram Sang <[email protected]> <[email protected]>
735735
736736
737737
738+
738739
Yusuke Goda <[email protected]>
739740
740741

Documentation/ABI/testing/sysfs-class-watchdog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Description:
7676
timeout when the pretimeout interrupt is delivered. Pretimeout
7777
is an optional feature.
7878

79-
What: /sys/class/watchdog/watchdogn/pretimeout_avaialable_governors
79+
What: /sys/class/watchdog/watchdogn/pretimeout_available_governors
8080
Date: February 2017
8181
Contact: Wim Van Sebroeck <[email protected]>
8282
Description:

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,6 +4822,11 @@
48224822
can be preempted anytime. Tasks will also yield
48234823
contended spinlocks (if the critical section isn't
48244824
explicitly preempt disabled beyond the lock itself).
4825+
lazy - Scheduler controlled. Similar to full but instead
4826+
of preempting the task immediately, the task gets
4827+
one HZ tick time to yield itself before the
4828+
preemption will be forced. One preemption is when the
4829+
task returns to user space.
48254830

48264831
print-fatal-signals=
48274832
[KNL] debug: print fatal signals

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,10 @@ event code Key Notes
445445
0x1008 0x07 FN+F8 IBM: toggle screen expand
446446
Lenovo: configure UltraNav,
447447
or toggle screen expand.
448-
On newer platforms (2024+)
449-
replaced by 0x131f (see below)
448+
On 2024 platforms replaced by
449+
0x131f (see below) and on newer
450+
platforms (2025 +) keycode is
451+
replaced by 0x1401 (see below).
450452

451453
0x1009 0x08 FN+F9 -
452454

@@ -506,9 +508,11 @@ event code Key Notes
506508

507509
0x1019 0x18 unknown
508510

509-
0x131f ... FN+F8 Platform Mode change.
511+
0x131f ... FN+F8 Platform Mode change (2024 systems).
510512
Implemented in driver.
511513

514+
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
515+
Implemented in driver.
512516
... ... ...
513517

514518
0x1020 0x1F unknown

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ AnonHugePmdMapped).
436436
The number of file transparent huge pages mapped to userspace is available
437437
by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.
438438
To identify what applications are mapping file transparent huge pages, it
439-
is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields
439+
is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields
440440
for each mapping.
441441

442442
Note that reading the smaps file is expensive and reading it

Documentation/admin-guide/pm/amd-pstate.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_).
251251
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``
252252
table, so we need to expose it to sysfs. If boost is not active, but
253253
still supported, this maximum frequency will be larger than the one in
254-
``cpuinfo``. On systems that support preferred core, the driver will have
255-
different values for some cores than others and this will reflect the values
256-
advertised by the platform at bootup.
254+
``cpuinfo``.
257255
This attribute is read-only.
258256

259257
``amd_pstate_lowest_nonlinear_freq``

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,9 @@ stable kernels.
255255
+----------------+-----------------+-----------------+-----------------------------+
256256
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
257257
+----------------+-----------------+-----------------+-----------------------------+
258-
| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A |
259-
| | ,11} SMMU PMCG | | |
258+
| Hisilicon | Hip{08,09,09A,10| #162001900 | N/A |
259+
| | ,10C,11} | | |
260+
| | SMMU PMCG | | |
260261
+----------------+-----------------+-----------------+-----------------------------+
261262
| Hisilicon | Hip09 | #162100801 | HISILICON_ERRATUM_162100801 |
262263
+----------------+-----------------+-----------------+-----------------------------+

Documentation/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Please note that due to macro expansion that argument needs to be a
4646
preprocessor symbol. E.g. to export the symbol ``usb_stor_suspend`` into the
4747
namespace ``USB_STORAGE``, use::
4848

49-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
49+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
5050

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
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
6868
export all symbols defined in usb-common into the namespace USB_COMMON, add a
6969
line like this to drivers/usb/common/Makefile::
7070

71-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
71+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7272

7373
That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
7474
symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
7979
unit as preprocessor statement. The above example would then read::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
8585
used.
@@ -94,7 +94,7 @@ for the namespaces it uses symbols from. E.g. a module using the
9494
usb_stor_suspend symbol from above, needs to import the namespace USB_STORAGE
9595
using a statement like::
9696

97-
MODULE_IMPORT_NS(USB_STORAGE);
97+
MODULE_IMPORT_NS("USB_STORAGE");
9898

9999
This will create a ``modinfo`` tag in the module for each imported namespace.
100100
This has the side effect, that the imported namespaces of a module can be

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ patternProperties:
114114
table that specifies the PPID to LIODN mapping. Needed if the PAMU is
115115
used. Value is a 12 bit value where value is a LIODN ID for this JR.
116116
This property is normally set by boot firmware.
117-
$ref: /schemas/types.yaml#/definitions/uint32
118-
maximum: 0xfff
117+
$ref: /schemas/types.yaml#/definitions/uint32-array
118+
items:
119+
- maximum: 0xfff
119120

120121
'^rtic@[0-9a-f]+$':
121122
type: object
@@ -186,8 +187,9 @@ patternProperties:
186187
Needed if the PAMU is used. Value is a 12 bit value where value
187188
is a LIODN ID for this JR. This property is normally set by boot
188189
firmware.
189-
$ref: /schemas/types.yaml#/definitions/uint32
190-
maximum: 0xfff
190+
$ref: /schemas/types.yaml#/definitions/uint32-array
191+
items:
192+
- maximum: 0xfff
191193

192194
fsl,rtic-region:
193195
description:

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
adi,dsi-lanes:
9191
description: Number of DSI data lanes connected to the DSI host.
9292
$ref: /schemas/types.yaml#/definitions/uint32
93-
enum: [ 1, 2, 3, 4 ]
93+
enum: [ 2, 3, 4 ]
9494

9595
"#sound-dai-cells":
9696
const: 0

0 commit comments

Comments
 (0)