Skip to content

Commit 742c85d

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.157' into 6.1-main
This is the 6.1.157 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmj09dQACgkQONu9yGCS # aT77bQ//ZP9P3G+FLJU1qhSyHlhFLaZiqhQiV/H7gOlbI4s7cWsISbbB7wyn+r6P # KvqmqQ30ZZzgIOFrB0m3hKDLT0foW4+HuV892E84woV5FC7LtQuElEQ86a24xj8g # 9DeDgXi84uItzELojWuIXK35II/1LXq9uJOdzaRTcTTjF+4Bd+nM0eZAjYTcb7ST # QVtR0RGnCnKJu9jO5SmOSqjC2DWDSc5wKqhzbQfOsBaXNpRXozy4VezqffwAckxL # HqbT/hDnpnKuHSkKcEqcjuR14au33P3BBjh3gPmy5S5vAONpnYYiWUigKaSaH/7D # gPX9/EwbG6F8b3J76HucxC9/JKwd9c3ZPIqIOuiU/DyQNUWdVoML+sP1g4ANI07b # 2K1X9hqTUNRuqzPE1Kng1GZFusJrAgPTmL3UWlPM6S3hBaJAzxMQRyFIkKatsCYz # 3o69u/fFbhuVlNu2w6vULsA/8Fyk1qNMCrdB+LL04inABiy3bq3h3bHnezlIekEr # 5D7LTVvTUV3NSYyW05qa1IvDPzaaxwEe49GNuMqdWlpzRcFC8LVg/ZXMZhwmJh17 # xIZXMEZDfiNFWN+4i7yR6Kzhlqd6EOpt+rqCBX0ox8fQpBAGbHTPkfbq+SnS17M8 # aH98zpV+VK47DSTZPeA8fI4VmaEKxnl+l9rgLiAVZXmy15pqzG8= # =Kp96 # -----END PGP SIGNATURE----- # gpg: Signature made Sun Oct 19 16:29:40 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 9e0e18c + 8e6e218 commit 742c85d

File tree

164 files changed

+1637
-854
lines changed

Some content is hidden

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

164 files changed

+1637
-854
lines changed

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5446,6 +5446,9 @@
54465446

54475447
rootflags= [KNL] Set root filesystem mount option string
54485448

5449+
initramfs_options= [KNL]
5450+
Specify mount options for for the initramfs mount.
5451+
54495452
rootfstype= [KNL] Set root filesystem type
54505453

54515454
rootwait [KNL] Wait (indefinitely) for root device to show up.

‎Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,24 @@ required:
5757
- clocks
5858
- clock-names
5959
- '#phy-cells'
60-
- power-domains
6160
- resets
6261
- reset-names
6362
- rockchip,grf
6463

64+
allOf:
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- rockchip,px30-csi-dphy
71+
- rockchip,rk1808-csi-dphy
72+
- rockchip,rk3326-csi-dphy
73+
- rockchip,rk3368-csi-dphy
74+
then:
75+
required:
76+
- power-domains
77+
6578
additionalProperties: false
6679

6780
examples:

‎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 = 1
4-
SUBLEVEL = 156
4+
SUBLEVEL = 157
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/arm/mach-omap2/pm33xx-core.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,15 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
393393
if (!state_node)
394394
break;
395395

396-
if (!of_device_is_available(state_node))
396+
if (!of_device_is_available(state_node)) {
397+
of_node_put(state_node);
397398
continue;
399+
}
398400

399401
if (i == CPUIDLE_STATE_MAX) {
400402
pr_warn("%s: cpuidle states reached max possible\n",
401403
__func__);
404+
of_node_put(state_node);
402405
break;
403406
}
404407

@@ -408,6 +411,7 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
408411
states[state_count].wfi_flags |= WFI_FLAG_WAKE_M3 |
409412
WFI_FLAG_FLUSH_CACHE;
410413

414+
of_node_put(state_node);
411415
state_count++;
412416
}
413417

‎arch/arm64/boot/dts/qcom/msm8916.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,8 @@
981981

982982
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
983983

984+
resets = <&gcc GCC_MDSS_BCR>;
985+
984986
interrupt-controller;
985987
#interrupt-cells = <1>;
986988

‎arch/arm64/boot/dts/qcom/sdm845.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5134,11 +5134,11 @@
51345134
compatible = "qcom,bam-v1.7.0";
51355135
qcom,controlled-remotely;
51365136
reg = <0 0x17184000 0 0x2a000>;
5137-
num-channels = <31>;
5137+
num-channels = <23>;
51385138
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
51395139
#dma-cells = <1>;
51405140
qcom,ee = <1>;
5141-
qcom,num-ees = <2>;
5141+
qcom,num-ees = <4>;
51425142
iommus = <&apps_smmu 0x1806 0x0>;
51435143
};
51445144

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797

9898
main_pmx0: pinctrl@f4000 {
9999
compatible = "pinctrl-single";
100-
reg = <0x00 0xf4000 0x00 0x2ac>;
100+
reg = <0x00 0xf4000 0x00 0x25c>;
101101
#pinctrl-cells = <1>;
102102
pinctrl-single,register-width = <32>;
103103
pinctrl-single,function-mask = <0xffffffff>;

‎arch/loongarch/kernel/setup.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,9 @@ void __init platform_init(void)
252252
arch_reserve_vmcore();
253253
arch_parse_crashkernel();
254254

255-
#ifdef CONFIG_ACPI_TABLE_UPGRADE
256-
acpi_table_upgrade();
257-
#endif
258255
#ifdef CONFIG_ACPI
256+
acpi_table_upgrade();
257+
acpi_gbl_use_global_lock = false;
259258
acpi_gbl_use_default_register_widths = false;
260259
acpi_boot_table_init();
261260
#endif

‎arch/parisc/include/uapi/asm/ioctls.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#define TCSETS _IOW('T', 17, struct termios) /* TCSETATTR */
1111
#define TCSETSW _IOW('T', 18, struct termios) /* TCSETATTRD */
1212
#define TCSETSF _IOW('T', 19, struct termios) /* TCSETATTRF */
13-
#define TCGETA _IOR('T', 1, struct termio)
14-
#define TCSETA _IOW('T', 2, struct termio)
15-
#define TCSETAW _IOW('T', 3, struct termio)
16-
#define TCSETAF _IOW('T', 4, struct termio)
13+
#define TCGETA 0x40125401
14+
#define TCSETA 0x80125402
15+
#define TCSETAW 0x80125403
16+
#define TCSETAF 0x80125404
1717
#define TCSBRK _IO('T', 5)
1818
#define TCXONC _IO('T', 6)
1919
#define TCFLSH _IO('T', 7)

‎arch/parisc/lib/memcpy.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ unsigned long raw_copy_from_user(void *dst, const void __user *src,
4141
mtsp(get_kernel_space(), SR_TEMP2);
4242

4343
/* Check region is user accessible */
44-
if (start)
4544
while (start < end) {
4645
if (!prober_user(SR_TEMP1, start)) {
4746
newlen = (start - (unsigned long) src);

0 commit comments

Comments
 (0)