Skip to content

Commit cc609b2

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.6' into 6.18-main
This is the 6.18.6 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmlrrEsACgkQONu9yGCS # aT4HRQ//cX1C76px29z9nvw/gBB7/ayjoLhO995ypO/SKSDKOCrXPou+684uiavS # DLGTkn8tFe/tI/ErRJcD/v9XsLTd9O4KIZq6sz/1hRB5wqpMQ29ruNslPPFK1eq0 # g++gR2GG7Pm6NFJpSXlrxk0SeJnroONvfOL3ZkDqSIY6dkMds8NFjKlnb/rPEpTi # 1mj+Kv/YKk1VG9dwmmSY8ds/pmpm7oZNTkEszZaquM9h8t3xOJwgV405OCxCgtXU # 3znYIuzq/W6Mah00FYMPOg0fF/64XznA4LiB44qTDVvSGeck3PqNIL+FMAKAJrcW # HRIvjqUcYjSC09BceHLcWHeRMIdiVgXhkAP8LokGyylWqfG/s/5I9/tO5yNDdFh4 # 4iZNWbfVTvJnINGnkWf4qE+5c5JQem9jxIH5BwYLIpdiwkNtF5AkV9fLlqEb4w5S # /WxzM8v9yvxHxKoNkYpuUSkCJxu7VoqHDlelAWVEuxgsblLP4gRIsl4CP3TMPz+m # 2+YwyyMXdABxW6ja8Z477AkXE3BTOeHRHgO5AGxbl0xTKdWOetFsuXPgVwKjR2L6 # F4815EoS7EQDUK3/pdcrvoyvuf9BpdfAApQnb9BWXH2abP4RFcdq7KLWKJW8RCJB # FyduBHcT0sKMbgaF8ofp3zkGYxqWp7oQDBp7rYW5fkyVuZo0pbA= # =wRjT # -----END PGP SIGNATURE----- # gpg: Signature made Sat Jan 17 16:35:39 2026 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents d878106 + b6fe42b commit cc609b2

File tree

187 files changed

+1763
-1093
lines changed

Some content is hidden

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

187 files changed

+1763
-1093
lines changed

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define TCSETSW _IOW('t', 21, struct termios)
2424
#define TCSETSF _IOW('t', 22, struct termios)
2525

26-
#define TCGETA _IOR('t', 23, struct termio)
27-
#define TCSETA _IOW('t', 24, struct termio)
28-
#define TCSETAW _IOW('t', 25, struct termio)
29-
#define TCSETAF _IOW('t', 28, struct termio)
26+
#define TCGETA 0x40127417
27+
#define TCSETA 0x80127418
28+
#define TCSETAW 0x80127419
29+
#define TCSETAF 0x8012741c
3030

3131
#define TCSBRK _IO('t', 29)
3232
#define TCXONC _IO('t', 30)

‎arch/arm/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ config HIGHMEM
12151215

12161216
config HIGHPTE
12171217
bool "Allocate 2nd-level pagetables from highmem" if EXPERT
1218-
depends on HIGHMEM
1218+
depends on HIGHMEM && !PREEMPT_RT
12191219
default y
12201220
help
12211221
The VM uses one page of physical memory for each page table.

‎arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
pinctrl-0 = <&pinctrl_rtc>;
338338
reg = <0x32>;
339339
interrupt-parent = <&gpio4>;
340-
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
340+
interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
341341
};
342342
};
343343

‎arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
ethphy0f: ethernet-phy@1 { /* SMSC LAN8740Ai */
114114
compatible = "ethernet-phy-id0007.c110",
115115
"ethernet-phy-ieee802.3-c22";
116+
clocks = <&clk IMX8MP_CLK_ENET_QOS>;
116117
interrupt-parent = <&gpio3>;
117118
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
118119
pinctrl-0 = <&pinctrl_ethphy0>;

‎arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "imx8mp-tx8p-ml81.dtsi"
1010

1111
/ {
12-
compatible = "gocontroll,moduline-display", "fsl,imx8mp";
12+
compatible = "gocontroll,moduline-display-106", "karo,tx8p-ml81", "fsl,imx8mp";
1313
chassis-type = "embedded";
1414
hardware = "Moduline Display V1.06";
1515
model = "GOcontroll Moduline Display baseboard";

‎arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81.dtsi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<&clk IMX8MP_SYS_PLL2_100M>,
4848
<&clk IMX8MP_SYS_PLL2_50M>;
4949
assigned-clock-rates = <266000000>, <100000000>, <50000000>;
50+
nvmem-cells = <&eth_mac1>;
5051
phy-handle = <&ethphy0>;
5152
phy-mode = "rmii";
5253
pinctrl-0 = <&pinctrl_eqos>;
@@ -75,6 +76,10 @@
7576
};
7677
};
7778

79+
&fec {
80+
nvmem-cells = <&eth_mac2>;
81+
};
82+
7883
&gpio1 {
7984
gpio-line-names = "SODIMM_152",
8085
"SODIMM_42",

‎arch/arm64/boot/dts/freescale/imx8qm-mek.dts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
regulator-max-microvolt = <3000000>;
257257
gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
258258
enable-active-high;
259+
off-on-delay-us = <4800>;
259260
};
260261

261262
reg_audio: regulator-audio {
@@ -560,7 +561,7 @@
560561
compatible = "isil,isl29023";
561562
reg = <0x44>;
562563
interrupt-parent = <&lsio_gpio4>;
563-
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
564+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
564565
};
565566

566567
pressure-sensor@60 {

‎arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,25 @@
171171

172172
&lpuart0 {
173173
compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart";
174-
dmas = <&edma2 13 0 0>, <&edma2 12 0 1>;
174+
dmas = <&edma2 12 0 FSL_EDMA_RX>, <&edma2 13 0 0>;
175175
dma-names = "rx","tx";
176176
};
177177

178178
&lpuart1 {
179179
compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart";
180-
dmas = <&edma2 15 0 0>, <&edma2 14 0 1>;
180+
dmas = <&edma2 14 0 FSL_EDMA_RX>, <&edma2 15 0 0>;
181181
dma-names = "rx","tx";
182182
};
183183

184184
&lpuart2 {
185185
compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart";
186-
dmas = <&edma2 17 0 0>, <&edma2 16 0 1>;
186+
dmas = <&edma2 16 0 FSL_EDMA_RX>, <&edma2 17 0 0>;
187187
dma-names = "rx","tx";
188188
};
189189

190190
&lpuart3 {
191191
compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart";
192-
dmas = <&edma2 19 0 0>, <&edma2 18 0 1>;
192+
dmas = <&edma2 18 0 FSL_EDMA_RX>, <&edma2 19 0 0>;
193193
dma-names = "rx","tx";
194194
};
195195

‎arch/arm64/boot/dts/freescale/imx95.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@
806806
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
807807
#address-cells = <3>;
808808
#size-cells = <0>;
809-
clocks = <&scmi_clk IMX95_CLK_BUSAON>,
809+
clocks = <&scmi_clk IMX95_CLK_BUSWAKEUP>,
810810
<&scmi_clk IMX95_CLK_I3C2SLOW>;
811811
clock-names = "pclk", "fast_clk";
812812
status = "disabled";

0 commit comments

Comments
 (0)