Skip to content

Commit 2538c4f

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into v6.6+
2 parents bfd709d + bd3a9e5 commit 2538c4f

591 files changed

Lines changed: 6024 additions & 3334 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.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5870,6 +5870,13 @@
58705870
This feature may be more efficiently disabled
58715871
using the csdlock_debug- kernel parameter.
58725872

5873+
smp.panic_on_ipistall= [KNL]
5874+
If a csd_lock_timeout extends for more than
5875+
the specified number of milliseconds, panic the
5876+
system. By default, let CSD-lock acquisition
5877+
take as long as they take. Specifying 300,000
5878+
for this value provides a 5-minute timeout.
5879+
58735880
smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices
58745881
smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port
58755882
smsc-ircc2.ircc_sir= [HW] SIR base I/O port

Documentation/devicetree/bindings/phy/qcom,snps-eusb2-repeater.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,27 @@ properties:
3232

3333
vdd3-supply: true
3434

35+
qcom,tune-usb2-disc-thres:
36+
$ref: /schemas/types.yaml#/definitions/uint8
37+
description: High-Speed disconnect threshold
38+
minimum: 0
39+
maximum: 7
40+
default: 0
41+
42+
qcom,tune-usb2-amplitude:
43+
$ref: /schemas/types.yaml#/definitions/uint8
44+
description: High-Speed trasmit amplitude
45+
minimum: 0
46+
maximum: 15
47+
default: 8
48+
49+
qcom,tune-usb2-preem:
50+
$ref: /schemas/types.yaml#/definitions/uint8
51+
description: High-Speed TX pre-emphasis tuning
52+
minimum: 0
53+
maximum: 7
54+
default: 5
55+
3556
required:
3657
- compatible
3758
- reg

Documentation/devicetree/bindings/serial/serial.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ then:
9696
rts-gpios: false
9797

9898
patternProperties:
99-
"^bluetooth|gnss|gps|mcu$":
99+
"^(bluetooth|gnss|gps|mcu)$":
100100
if:
101101
type: object
102102
then:

Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -169,46 +169,46 @@ properties:
169169
- const: tgib0
170170
- const: tgic0
171171
- const: tgid0
172-
- const: tgiv0
172+
- const: tciv0
173173
- const: tgie0
174174
- const: tgif0
175175
- const: tgia1
176176
- const: tgib1
177-
- const: tgiv1
178-
- const: tgiu1
177+
- const: tciv1
178+
- const: tciu1
179179
- const: tgia2
180180
- const: tgib2
181-
- const: tgiv2
182-
- const: tgiu2
181+
- const: tciv2
182+
- const: tciu2
183183
- const: tgia3
184184
- const: tgib3
185185
- const: tgic3
186186
- const: tgid3
187-
- const: tgiv3
187+
- const: tciv3
188188
- const: tgia4
189189
- const: tgib4
190190
- const: tgic4
191191
- const: tgid4
192-
- const: tgiv4
192+
- const: tciv4
193193
- const: tgiu5
194194
- const: tgiv5
195195
- const: tgiw5
196196
- const: tgia6
197197
- const: tgib6
198198
- const: tgic6
199199
- const: tgid6
200-
- const: tgiv6
200+
- const: tciv6
201201
- const: tgia7
202202
- const: tgib7
203203
- const: tgic7
204204
- const: tgid7
205-
- const: tgiv7
205+
- const: tciv7
206206
- const: tgia8
207207
- const: tgib8
208208
- const: tgic8
209209
- const: tgid8
210-
- const: tgiv8
211-
- const: tgiu8
210+
- const: tciv8
211+
- const: tciu8
212212

213213
clocks:
214214
maxItems: 1
@@ -285,16 +285,16 @@ examples:
285285
<GIC_SPI 211 IRQ_TYPE_EDGE_RISING>,
286286
<GIC_SPI 212 IRQ_TYPE_EDGE_RISING>,
287287
<GIC_SPI 213 IRQ_TYPE_EDGE_RISING>;
288-
interrupt-names = "tgia0", "tgib0", "tgic0", "tgid0", "tgiv0", "tgie0",
288+
interrupt-names = "tgia0", "tgib0", "tgic0", "tgid0", "tciv0", "tgie0",
289289
"tgif0",
290-
"tgia1", "tgib1", "tgiv1", "tgiu1",
291-
"tgia2", "tgib2", "tgiv2", "tgiu2",
292-
"tgia3", "tgib3", "tgic3", "tgid3", "tgiv3",
293-
"tgia4", "tgib4", "tgic4", "tgid4", "tgiv4",
290+
"tgia1", "tgib1", "tciv1", "tciu1",
291+
"tgia2", "tgib2", "tciv2", "tciu2",
292+
"tgia3", "tgib3", "tgic3", "tgid3", "tciv3",
293+
"tgia4", "tgib4", "tgic4", "tgid4", "tciv4",
294294
"tgiu5", "tgiv5", "tgiw5",
295-
"tgia6", "tgib6", "tgic6", "tgid6", "tgiv6",
296-
"tgia7", "tgib7", "tgic7", "tgid7", "tgiv7",
297-
"tgia8", "tgib8", "tgic8", "tgid8", "tgiv8", "tgiu8";
295+
"tgia6", "tgib6", "tgic6", "tgid6", "tciv6",
296+
"tgia7", "tgib7", "tgic7", "tgid7", "tciv7",
297+
"tgia8", "tgib8", "tgic8", "tgid8", "tciv8", "tciu8";
298298
clocks = <&cpg CPG_MOD R9A07G044_MTU_X_MCK_MTU3>;
299299
power-domains = <&cpg>;
300300
resets = <&cpg R9A07G044_MTU_X_PRESET_MTU3>;

Documentation/i2c/busses/i2c-i801.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Supported adapters:
4747
* Intel Alder Lake (PCH)
4848
* Intel Raptor Lake (PCH)
4949
* Intel Meteor Lake (SOC and PCH)
50+
* Intel Birch Stream (SOC)
5051

5152
Datasheets: Publicly available at the Intel website
5253

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 2
4+
SUBLEVEL = 3
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

arch/arm/include/asm/exception.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include <linux/interrupt.h>
1212

13-
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
1413
#define __exception_irq_entry __irq_entry
15-
#else
16-
#define __exception_irq_entry
17-
#endif
1814

1915
#endif /* __ASM_ARM_EXCEPTION_H */

arch/arm64/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,8 @@ choice
13681368
config CPU_BIG_ENDIAN
13691369
bool "Build big-endian kernel"
13701370
depends on !LD_IS_LLD || LLD_VERSION >= 130000
1371+
# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c
1372+
depends on AS_IS_GNU || AS_VERSION >= 150000
13711373
help
13721374
Say Y if you plan on running a kernel with a big-endian userspace.
13731375

arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,26 +1186,34 @@
11861186
dma-coherent;
11871187
};
11881188

1189-
usb0: usb@3100000 {
1190-
status = "disabled";
1191-
compatible = "snps,dwc3";
1192-
reg = <0x0 0x3100000 0x0 0x10000>;
1193-
interrupts = <0 80 0x4>; /* Level high type */
1194-
dr_mode = "host";
1195-
snps,quirk-frame-length-adjustment = <0x20>;
1196-
snps,dis_rxdet_inp3_quirk;
1197-
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
1198-
};
1189+
bus: bus {
1190+
#address-cells = <2>;
1191+
#size-cells = <2>;
1192+
compatible = "simple-bus";
1193+
ranges;
1194+
dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
1195+
1196+
usb0: usb@3100000 {
1197+
compatible = "snps,dwc3";
1198+
reg = <0x0 0x3100000 0x0 0x10000>;
1199+
interrupts = <0 80 0x4>; /* Level high type */
1200+
dr_mode = "host";
1201+
snps,quirk-frame-length-adjustment = <0x20>;
1202+
snps,dis_rxdet_inp3_quirk;
1203+
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
1204+
status = "disabled";
1205+
};
11991206

1200-
usb1: usb@3110000 {
1201-
status = "disabled";
1202-
compatible = "snps,dwc3";
1203-
reg = <0x0 0x3110000 0x0 0x10000>;
1204-
interrupts = <0 81 0x4>; /* Level high type */
1205-
dr_mode = "host";
1206-
snps,quirk-frame-length-adjustment = <0x20>;
1207-
snps,dis_rxdet_inp3_quirk;
1208-
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
1207+
usb1: usb@3110000 {
1208+
compatible = "snps,dwc3";
1209+
reg = <0x0 0x3110000 0x0 0x10000>;
1210+
interrupts = <0 81 0x4>; /* Level high type */
1211+
dr_mode = "host";
1212+
snps,quirk-frame-length-adjustment = <0x20>;
1213+
snps,dis_rxdet_inp3_quirk;
1214+
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
1215+
status = "disabled";
1216+
};
12091217
};
12101218

12111219
ccn@4000000 {

arch/arm64/boot/dts/qcom/ipq5332.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
reg = <0x0 0x4a800000 0x0 0x100000>;
136136
no-map;
137137

138-
hwlocks = <&tcsr_mutex 0>;
138+
hwlocks = <&tcsr_mutex 3>;
139139
};
140140
};
141141

0 commit comments

Comments
 (0)