Skip to content

Commit bf57832

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.149' into 6.1-main
This is the 6.1.149 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmiwZ0gACgkQONu9yGCS # aT6urA//aPWnE8lsThoMQIfLAF5Bx9dGP1RSgnd/tXayKdOt4PQL1bDG4WFGyqbV # zQkCtIKFD9fYzOiKZ/OZ1Cd5a8xYYcijbXzaUQpjvcjbgPXh/9pp16NgjtcqP3U4 # 0KZh43DOH0YHfMPo9xqI0dfThXwGqQLmAl85qwD2XtOQLjXonCtCJ8RU8HAMaxKs # 6CnYpqbYDsjjSArKOFWLEjb/WlNdAQwlg3DKu6lPDvQbnL4u6vEf3do7a1I/wL24 # 6jPAfmtX7C5ZlGsPAhTjjqc6neeb7CKLPqrXu3vUiNw9UrbSSpnOuE99tQ0m/RTB # BbJ8KF6/4LbMra3IobZM/i4gxXhVCqLSeKopQvOUnpbTIcawdhzUXGrOt1AvXXo6 # beflR5NbRuB06VJYEHTg2vfH3RTdrhpu+cojXhC4zVJMwDqyHZeBxJCtYimB0lzm # nEp5PndfMOLxviaM/NGJlHJneyMTKxURn1kDHdnSqjG74B6SqSJJ3xL3w9YOX0CN # Q0j0RCyNIOuDo93kvZ2jJa32np0umKoxRdWPIsANQCm3k9US1WMV89shJahyM8ha # KytElm1yxOY0ixyf/ctIVvAhs0c941HMRHkhs6s0tMue603DIDV1MlISiGb9/ThY # zu9Uo6M/ZgCT93lWRHbswduHL+sRdge+KSv0VvCgOWoVQPJwRyc= # =Lmt2 # -----END PGP SIGNATURE----- # gpg: Signature made Thu Aug 28 16:27:20 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 1c63234 + f89b6e1 commit bf57832

511 files changed

Lines changed: 4940 additions & 1988 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/devicetree/bindings/display/sprd/sprd,sharkl3-dpu.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525
maxItems: 1
2626

2727
clocks:
28-
minItems: 2
28+
maxItems: 2
2929

3030
clock-names:
3131
items:

‎Documentation/devicetree/bindings/display/sprd/sprd,sharkl3-dsi-host.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ properties:
2020
maxItems: 2
2121

2222
clocks:
23-
minItems: 1
23+
maxItems: 1
2424

2525
clock-names:
2626
items:

‎Documentation/firmware-guide/acpi/i2c-muxes.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Consider this topology::
1414
| | | 0x70 |--CH01--> i2c client B (0x50)
1515
+------+ +------+
1616

17-
which corresponds to the following ASL::
17+
which corresponds to the following ASL (in the scope of \_SB)::
1818

1919
Device (SMB1)
2020
{
@@ -24,7 +24,7 @@ which corresponds to the following ASL::
2424
Name (_HID, ...)
2525
Name (_CRS, ResourceTemplate () {
2626
I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,
27-
AddressingMode7Bit, "^SMB1", 0x00,
27+
AddressingMode7Bit, "\\_SB.SMB1", 0x00,
2828
ResourceConsumer,,)
2929
}
3030

@@ -37,7 +37,7 @@ which corresponds to the following ASL::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "^CH00", 0x00,
40+
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
4141
ResourceConsumer,,)
4242
}
4343
}
@@ -52,7 +52,7 @@ which corresponds to the following ASL::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "^CH01", 0x00,
55+
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
5656
ResourceConsumer,,)
5757
}
5858
}

‎Documentation/networking/bonding.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,18 @@ arp_missed_max
444444

445445
The default value is 2, and the allowable range is 1 - 255.
446446

447+
coupled_control
448+
449+
Specifies whether the LACP state machine's MUX in the 802.3ad mode
450+
should have separate Collecting and Distributing states.
451+
452+
This is by implementing the independent control state machine per
453+
IEEE 802.1AX-2008 5.4.15 in addition to the existing coupled control
454+
state machine.
455+
456+
The default value is 1. This setting does not separate the Collecting
457+
and Distributing states, maintaining the bond in coupled control.
458+
447459
downdelay
448460

449461
Specifies the time, in milliseconds, to wait before disabling

‎Documentation/networking/mptcp-sysctl.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ add_addr_timeout - INTEGER (seconds)
2020
resent to an MPTCP peer that has not acknowledged a previous
2121
ADD_ADDR message.
2222

23+
Do not retransmit if set to 0.
24+
2325
The default value matches TCP_RTO_MAX. This is a per-namespace
2426
sysctl.
2527

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 148
4+
SUBLEVEL = 149
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

@@ -1143,7 +1143,7 @@ KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD
11431143
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11441144

11451145
# userspace programs are linked via the compiler, use the correct linker
1146-
ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy)
1146+
ifdef CONFIG_CC_IS_CLANG
11471147
KBUILD_USERLDFLAGS += $(call cc-option, --ld-path=$(LD))
11481148
endif
11491149

‎arch/arm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ endif
133133

134134
# Need -Uarm for gcc < 3.x
135135
KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
136-
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
136+
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include $(srctree)/arch/arm/include/asm/unified.h -msoft-float
137137

138138
CHECKFLAGS += -D__arm__
139139

‎arch/arm/mach-rockchip/platsmp.c‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,6 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
279279
}
280280

281281
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {
282-
if (rockchip_smp_prepare_sram(node)) {
283-
of_node_put(node);
284-
return;
285-
}
286-
287282
/* enable the SCU power domain */
288283
pmu_set_power_domain(PMU_PWRDN_SCU, true);
289284

@@ -316,11 +311,19 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
316311
asm ("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr));
317312
ncores = ((l2ctlr >> 24) & 0x3) + 1;
318313
}
319-
of_node_put(node);
320314

321315
/* Make sure that all cores except the first are really off */
322316
for (i = 1; i < ncores; i++)
323317
pmu_set_power_domain(0 + i, false);
318+
319+
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {
320+
if (rockchip_smp_prepare_sram(node)) {
321+
of_node_put(node);
322+
return;
323+
}
324+
}
325+
326+
of_node_put(node);
324327
}
325328

326329
static void __init rk3036_smp_prepare_cpus(unsigned int max_cpus)

‎arch/arm/mach-tegra/reset.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static void __init tegra_cpu_reset_handler_enable(void)
6363
BUG_ON(is_enabled);
6464
BUG_ON(tegra_cpu_reset_handler_size > TEGRA_IRAM_RESET_HANDLER_SIZE);
6565

66-
memcpy(iram_base, (void *)__tegra_cpu_reset_handler_start,
66+
memcpy_toio(iram_base, (void *)__tegra_cpu_reset_handler_start,
6767
tegra_cpu_reset_handler_size);
6868

6969
err = call_firmware_op(set_cpu_boot_addr, 0, reset_address);

‎arch/arm64/boot/dts/ti/k3-am62-main.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@
386386
clock-names = "clk_ahb", "clk_xin";
387387
assigned-clocks = <&k3_clks 57 6>;
388388
assigned-clock-parents = <&k3_clks 57 8>;
389-
mmc-ddr-1_8v;
390389
mmc-hs200-1_8v;
391390
ti,trm-icp = <0x2>;
392391
bus-width = <8>;

0 commit comments

Comments
 (0)