Skip to content

Commit 507cc4d

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.23' into 6.18-main
This is the 6.18.23 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmnjRMUACgkQONu9yGCS # aT4Jbg/9H6YGFYhGFjjtyA7+y1Pl7RqY2uxxjeDe3jI5V+BgaHoBWP48RoPOdwan # /XhDFOEBW/I8XFS/ZlJR9XqahLCmsydCwgIqZ8WdZYhxISBZf9LjOlotzgnGf01N # QjZuiLlgO+9ZAMa7xQtvBFQTZCXmt0AG1rSWafjwXKnJCCbjLPvzQb84/BzaZBpe # Y6Qan4x3Qyf9MLg+8h+qeBnkcAhfK4ZspMqWIuLj/Q6e2gKZjF4QppHoOjv3t+O+ # 8gaJ3KF0z3munF1Ezix1U5500VozJ9LhUFysu9WoZkfRvv+mrKrRNpd4eNnIjdCW # 1s5jPU3HTTmRUNbZ08rlKgRhP7Gpv4bfrY7ucqRXtHuZfp8BzF6B9tkzQPVEvijT # 1XX+RMEFuFiruhxfKgMA2hqFILvqqgHb2eXCQfZ8j9KW5zwt26PRcst2yNTZuGN/ # 7srSX05CMOH+z/EGjLseJEjGBoqfmRosOwgish4IRT6RqsPFo4WbLWhdyZsIgDZf # uvHhXs2UvauuOTQWbxAtJl3CZDyfTKuEIJ0aKk5q7iiU8Pl/4rqkCuIwMtJ0/1En # Y8ahogywzfwKIqY5xJAP3oTeVtjN+Ev0lp+G06OGsqnIk3F4DnxJtSqg9b2si3fY # Exnjx6QmgkJtefYva57edtLE52kXZXcPmxFoXrR3URoaXJBn5jU= # =tiRp # -----END PGP SIGNATURE----- # gpg: Signature made Sat Apr 18 10:45:57 2026 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 651b77b + 47a33ee commit 507cc4d

81 files changed

Lines changed: 843 additions & 489 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.

‎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 = 18
4-
SUBLEVEL = 22
4+
SUBLEVEL = 23
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts‎

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

88
&a53_opp_table {
99
opp-1000000000 {
10-
opp-microvolt = <950000>;
10+
opp-microvolt = <1000000>;
1111
};
1212
};
1313

‎arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -844,9 +844,9 @@
844844
regulator-max-microvolt = <1300000>;
845845
regulator-boot-on;
846846
regulator-ramp-delay = <1250>;
847-
rohm,dvs-run-voltage = <880000>;
848-
rohm,dvs-idle-voltage = <820000>;
849-
rohm,dvs-suspend-voltage = <810000>;
847+
rohm,dvs-run-voltage = <900000>;
848+
rohm,dvs-idle-voltage = <850000>;
849+
rohm,dvs-suspend-voltage = <850000>;
850850
regulator-always-on;
851851
};
852852

@@ -856,8 +856,8 @@
856856
regulator-max-microvolt = <1300000>;
857857
regulator-boot-on;
858858
regulator-ramp-delay = <1250>;
859-
rohm,dvs-run-voltage = <950000>;
860-
rohm,dvs-idle-voltage = <850000>;
859+
rohm,dvs-run-voltage = <1000000>;
860+
rohm,dvs-idle-voltage = <900000>;
861861
regulator-always-on;
862862
};
863863

@@ -866,14 +866,14 @@
866866
regulator-min-microvolt = <700000>;
867867
regulator-max-microvolt = <1300000>;
868868
regulator-boot-on;
869-
rohm,dvs-run-voltage = <850000>;
869+
rohm,dvs-run-voltage = <900000>;
870870
};
871871

872872
buck4_reg: BUCK4 {
873873
regulator-name = "buck4";
874874
regulator-min-microvolt = <700000>;
875875
regulator-max-microvolt = <1300000>;
876-
rohm,dvs-run-voltage = <930000>;
876+
rohm,dvs-run-voltage = <1000000>;
877877
};
878878

879879
buck5_reg: BUCK5 {
@@ -1407,13 +1407,3 @@
14071407
fsl,ext-reset-output;
14081408
status = "okay";
14091409
};
1410-
1411-
&a53_opp_table {
1412-
opp-1000000000 {
1413-
opp-microvolt = <850000>;
1414-
};
1415-
1416-
opp-1500000000 {
1417-
opp-microvolt = <950000>;
1418-
};
1419-
};

‎arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
};
180180

181181
&pcie {
182-
reset-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
182+
reset-gpios = <&gpio4 4 GPIO_ACTIVE_LOW>;
183183
vpcie-supply = <&reg_pcie>;
184184
status = "okay";
185185
};

‎arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#address-cells = <1>;
123123
#size-cells = <1>;
124124
ranges = <0x0 0x0 0xf0000000 0x10000000>;
125+
dma-ranges = <0x0 0x0 0x0 0x40000000>;
125126

126127
crg: clock-reset-controller@8a22000 {
127128
compatible = "hisilicon,hi3798cv200-crg", "syscon", "simple-mfd";

‎arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@
118118
reg = <0x6 0x00000000 0x1 0x00000000>;
119119
};
120120

121+
reserved-memory {
122+
#address-cells = <2>;
123+
#size-cells = <2>;
124+
ranges;
125+
126+
tfa@40000000 {
127+
reg = <0x0 0x40000000 0x0 0x8000000>;
128+
no-map;
129+
};
130+
};
131+
121132
/* Page 27 / DSI to Display */
122133
dp-con {
123134
compatible = "dp-connector";

‎arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,6 @@
879879
};
880880
};
881881

882-
wifi {
883-
wifi_host_wake_l: wifi-host-wake-l {
884-
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
885-
};
886-
};
887-
888882
wireless-bluetooth {
889883
bt_wake_pin: bt-wake-pin {
890884
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -942,19 +936,7 @@
942936
pinctrl-names = "default";
943937
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
944938
sd-uhs-sdr104;
945-
#address-cells = <1>;
946-
#size-cells = <0>;
947939
status = "okay";
948-
949-
brcmf: wifi@1 {
950-
compatible = "brcm,bcm4329-fmac";
951-
reg = <1>;
952-
interrupt-parent = <&gpio0>;
953-
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
954-
interrupt-names = "host-wake";
955-
pinctrl-names = "default";
956-
pinctrl-0 = <&wifi_host_wake_l>;
957-
};
958940
};
959941

960942
&sdhci {

‎arch/mips/include/asm/cpu-features.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@
484484
# endif
485485
# ifndef cpu_vmbits
486486
# define cpu_vmbits cpu_data[0].vmbits
487-
# define __NEED_VMBITS_PROBE
488487
# endif
489488
#endif
490489

‎arch/mips/include/asm/cpu-info.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ struct cpuinfo_mips {
8080
int srsets; /* Shadow register sets */
8181
int package;/* physical package number */
8282
unsigned int globalnumber;
83-
#ifdef CONFIG_64BIT
8483
int vmbits; /* Virtual memory size in bits */
85-
#endif
8684
void *data; /* Additional data */
8785
unsigned int watch_reg_count; /* Number that exist */
8886
unsigned int watch_reg_use_cnt; /* Usable by ptrace */

‎arch/mips/include/asm/mipsregs.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,8 @@ do { \
18711871

18721872
#define read_c0_entryhi() __read_ulong_c0_register($10, 0)
18731873
#define write_c0_entryhi(val) __write_ulong_c0_register($10, 0, val)
1874+
#define read_c0_entryhi_64() __read_64bit_c0_register($10, 0)
1875+
#define write_c0_entryhi_64(val) __write_64bit_c0_register($10, 0, val)
18741876

18751877
#define read_c0_guestctl1() __read_32bit_c0_register($10, 4)
18761878
#define write_c0_guestctl1(val) __write_32bit_c0_register($10, 4, val)

0 commit comments

Comments
 (0)