Skip to content

Commit 5f9cb5e

Browse files
committed
Merge branch 'stable/linux-6.18.y' into linux-6.18-mchp
Fixed conflicts: - Makefile: keep EXTRAVERSION = -linux4microchip-2026.04.1 - drivers/spi/spi-microchip-core-qspi.c: keep internal fixes - include/linux/mmc/card.h: increment MMC_QUIRK_HS_CLK_REVERSED to (1<<21) Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>
2 parents 505aa76 + acb7cf4 commit 5f9cb5e

3,149 files changed

Lines changed: 45814 additions & 23821 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.
File renamed without changes.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7925,6 +7925,9 @@
79257925
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
79267926
(Reduce timeout of the SET_ADDRESS
79277927
request from 5000 ms to 500 ms);
7928+
q = USB_QUIRK_FORCE_ONE_CONFIG (Device
7929+
claims zero configurations,
7930+
forcing to 1);
79287931
Example: quirks=0781:5580:bk,0a5c:5834:gij
79297932

79307933
usbhid.mousepoll=

Documentation/admin-guide/mm/damon/reclaim.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ of parametrs except ``enabled`` again. Once the re-reading is done, this
7171
parameter is set as ``N``. If invalid parameters are found while the
7272
re-reading, DAMON_RECLAIM will be disabled.
7373

74+
Once ``Y`` is written to this parameter, the user must not write to any
75+
parameters until reading ``commit_inputs`` again returns ``N``. If users
76+
violate this rule, the kernel may exhibit undefined behavior.
77+
7478
min_age
7579
-------
7680

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,12 @@ HyperThreading (HT) in the context of Intel processors, is enabled on at least
348348
one core, ``intel_pstate`` assigns performance-based priorities to CPUs. Namely,
349349
the priority of a given CPU reflects its highest HWP performance level which
350350
causes the CPU scheduler to generally prefer more performant CPUs, so the less
351-
performant CPUs are used when the other ones are fully loaded. However, SMT
352-
siblings (that is, logical CPUs sharing one physical core) are treated in a
353-
special way such that if one of them is in use, the effective priority of the
354-
other ones is lowered below the priorities of the CPUs located in the other
355-
physical cores.
351+
performant CPUs are used when the other ones are fully loaded. SMT siblings
352+
(that is, logical CPUs sharing one physical core) are given the same priority.
353+
The scheduler can pull tasks from lower-priority cores and place them on any
354+
sibling. Since the scheduler spreads tasks among physical cores, tasks will be
355+
placed on the SMT siblings of physical cores only after all physical cores are
356+
busy.
356357

357358
This approach maximizes performance in the majority of cases, but unfortunately
358359
it also leads to excessive energy usage in some important scenarios, like video

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ stable kernels.
202202
+----------------+-----------------+-----------------+-----------------------------+
203203
| ARM | Neoverse-V3AE | #3312417 | ARM64_ERRATUM_3194386 |
204204
+----------------+-----------------+-----------------+-----------------------------+
205+
| ARM | C1-Pro | #4193714 | ARM64_ERRATUM_4193714 |
206+
+----------------+-----------------+-----------------+-----------------------------+
205207
| ARM | MMU-500 | #841119,826419 | ARM_SMMU_MMU_500_CPRE_ERRATA|
206208
| | | #562869,1047329 | |
207209
+----------------+-----------------+-----------------+-----------------------------+

Documentation/crypto/krb5.rst

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,22 @@ returned.
158158
When a message has been received, the location and size of the data with the
159159
message can be determined by calling::
160160

161-
void crypto_krb5_where_is_the_data(const struct krb5_enctype *krb5,
162-
enum krb5_crypto_mode mode,
163-
size_t *_offset, size_t *_len);
161+
int crypto_krb5_where_is_the_data(const struct krb5_enctype *krb5,
162+
enum krb5_crypto_mode mode,
163+
size_t *_offset, size_t *_len);
164164

165165
The caller provides the offset and length of the message to the function, which
166166
then alters those values to indicate the region containing the data (plus any
167-
padding). It is up to the caller to determine how much padding there is.
167+
padding). It is up to the caller to determine how much padding there is. The
168+
function returns an error if the length is too small or if the mode is
169+
unsupported. An additional function::
170+
171+
int crypto_krb5_check_data_len(const struct krb5_enctype *krb5,
172+
enum krb5_crypto_mode mode,
173+
size_t len, size_t min_content);
174+
175+
is provided to just do a basic check that the decrypted/verified message would
176+
have a sufficient minimum payload.
168177

169178
Preparation Functions
170179
---------------------

Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ then:
6666
required:
6767
- refresh-rate-hz
6868

69-
additionalProperties: false
69+
unevaluatedProperties: false
7070

7171
examples:
7272
- |

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ properties:
301301
maxItems: 4
302302

303303
dependencies:
304+
pd-disable: [typec-power-opmode]
304305
sink-vdos-v1: [ sink-vdos ]
305306
sink-vdos: [ sink-vdos-v1 ]
306307

Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1111

1212
description:
13-
SM8650 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
13+
SM8750 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
1414
DPU display controller, DSI and DP interfaces etc.
1515

1616
$ref: /schemas/display/msm/mdss-common.yaml#

Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,50 @@ properties:
3636
reg:
3737
description:
3838
Addresses to each DSS memory region described in the SoC's TRM.
39-
items:
40-
- description: common DSS register area
41-
- description: VIDL1 light video plane
42-
- description: VID video plane
43-
- description: OVR1 overlay manager for vp1
44-
- description: OVR2 overlay manager for vp2
45-
- description: VP1 video port 1
46-
- description: VP2 video port 2
47-
- description: common1 DSS register area
39+
oneOf:
40+
- items:
41+
- description: common DSS register area
42+
- description: VIDL1 light video plane
43+
- description: VID video plane
44+
- description: OVR1 overlay manager for vp1
45+
- description: OVR2 overlay manager for vp2
46+
- description: VP1 video port 1
47+
- description: VP2 video port 2
48+
- description: common1 DSS register area
49+
- items:
50+
- description: common DSS register area
51+
- description: VIDL1 light video plane
52+
- description: OVR1 overlay manager for vp1
53+
- description: VP1 video port 1
54+
- description: common1 DSS register area
4855

4956
reg-names:
50-
items:
51-
- const: common
52-
- const: vidl1
53-
- const: vid
54-
- const: ovr1
55-
- const: ovr2
56-
- const: vp1
57-
- const: vp2
58-
- const: common1
57+
oneOf:
58+
- items:
59+
- const: common
60+
- const: vidl1
61+
- const: vid
62+
- const: ovr1
63+
- const: ovr2
64+
- const: vp1
65+
- const: vp2
66+
- const: common1
67+
- items:
68+
- const: common
69+
- const: vidl1
70+
- const: ovr1
71+
- const: vp1
72+
- const: common1
5973

6074
clocks:
75+
minItems: 2
6176
items:
6277
- description: fck DSS functional clock
6378
- description: vp1 Video Port 1 pixel clock
6479
- description: vp2 Video Port 2 pixel clock
6580

6681
clock-names:
82+
minItems: 2
6783
items:
6884
- const: fck
6985
- const: vp1
@@ -180,6 +196,24 @@ allOf:
180196
ports:
181197
properties:
182198
port@1: false
199+
reg:
200+
maxItems: 5
201+
reg-names:
202+
maxItems: 5
203+
clocks:
204+
maxItems: 2
205+
clock-names:
206+
maxItems: 2
207+
else:
208+
properties:
209+
reg:
210+
minItems: 8
211+
reg-names:
212+
minItems: 8
213+
clocks:
214+
minItems: 3
215+
clock-names:
216+
minItems: 3
183217

184218
- if:
185219
properties:

0 commit comments

Comments
 (0)