Merge tag 'v6.18.2' into 6.18-main

This is the 6.18.2 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmlD++AACgkQONu9yGCS
# aT4FzBAAtmIk7OizXBIpOVJ0KXLBtwZygnDvjVcawTDbMBE+HVtTyPNGtlxBV59a
# 7lxYXE7K2reSwGraVIuo4XAeX5S6VZ0i/4/1V6f5NlJonoVP/LbzPGTg1z6rRAFV
# Cw0AmoIuqaLanVFBPtRGEuigLdB7KPciB6r/9MK+zdGQzIZ/7RzfdQULn9ymGqoJ
# I1yDPA3UHMT3rxborKXLL60hFV29cxebRtbJargLPavHA/4h2d/qUS6GFYiJPME5
# zpjG+bCv7f5IwfCGEO3mNaEr3rH68HsJO+n8iX9d7l193lrcRLOrbbbRdWwEQa3T
# 2qkFgjBHFaw1SLCzDPKgqI8x13GcuX411GAbjkHkcfrap182r1Av6FP67Nx2jefj
# lYwVHOfy6ByEdE8Z4xa3aFvu6WpwiCxQLEEssud0Kpha+Z/OePL/CP7Ov8yRdYT3
# W3h7gGOBu2uQsXgQKIbnqPB4C5GvttkqNRBbErJHKPPYb5TnyDo5emY38QFuNAJQ
# uvQON7GDU3/P6bqKlEUB4xIuNZbbHjl2GGS3cuN7GZcp2u7OCpSVmsmBK9o5zxJh
# XZId4rkt9wD2hoJ2pv0rh7EsQl8k0Kj7hedtvHBhx5EwElAXGkmQwB8Rdnfc/SvP
# /JY8uNsJUYNkehJBeRSvm1LjYcma/pw2nQttQ00FBH6rnxJ8360=
# =K7ou
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Dec 18 14:04:32 2025 CET
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Author: frank-w

Documentation/admin-guide/LSM/Smack.rst

@@ -601,10 +601,15 @@ specification.
 Task Attribute
 ~~~~~~~~~~~~~~
 
-The Smack label of a process can be read from /proc/<pid>/attr/current. A
-process can read its own Smack label from /proc/self/attr/current. A
+The Smack label of a process can be read from ``/proc/<pid>/attr/current``. A
+process can read its own Smack label from ``/proc/self/attr/current``. A
 privileged process can change its own Smack label by writing to
-/proc/self/attr/current but not the label of another process.
+``/proc/self/attr/current`` but not the label of another process.
+
+Format of writing is : only the label or the label followed by one of the
+3 trailers: ``\n`` (by common agreement for ``/proc/...`` interfaces),
+``\0`` (because some applications incorrectly include it),
+``\n\0`` (because we think some applications may incorrectly include it).
 
 File Attribute
 ~~~~~~~~~~~~~~
@@ -696,6 +701,11 @@ sockets.
 	A privileged program may set this to match the label of another
 	task with which it hopes to communicate.
 
+UNIX domain socket (UDS) with a BSD address functions both as a file in a
+filesystem and as a socket. As a file, it carries the SMACK64 attribute. This
+attribute is not involved in Smack security enforcement and is immutably
+assigned the label "*".
+
 Smack Netlabel Exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml

@@ -36,13 +36,13 @@ properties:
 
   reg:
     items:
-      - description: External local bus interface registers
+      - description: Data Bus Interface registers
       - description: Meson designed configuration registers
       - description: PCIe configuration space
 
   reg-names:
     items:
-      - const: elbi
+      - const: dbi
       - const: cfg
       - const: config
 
@@ -113,7 +113,7 @@ examples:
     pcie: pcie@f9800000 {
         compatible = "amlogic,axg-pcie", "snps,dw-pcie";
         reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>;
-        reg-names = "elbi", "cfg", "config";
+        reg-names = "dbi", "cfg", "config";
         interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>;
         clocks = <&pclk>, <&clk_port>, <&clk_phy>;
         clock-names = "pclk", "port", "general";

Documentation/hwmon/g762.rst

@@ -17,7 +17,7 @@ done via a userland daemon like fancontrol.
 Note that those entries do not provide ways to setup the specific
 hardware characteristics of the system (reference clock, pulses per
 fan revolution, ...); Those can be modified via devicetree bindings
-documented in Documentation/devicetree/bindings/hwmon/g762.txt or
+documented in Documentation/devicetree/bindings/hwmon/gmt,g762.yaml or
 using a specific platform_data structure in board initialization
 file (see include/linux/platform_data/g762.h).
 

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 18
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION =
 NAME = Baby Opossum Posse
 

arch/arm/boot/dts/renesas/r8a7793-gose.dts

@@ -373,7 +373,6 @@
 				port@3 {
 					reg = <3>;
 					adv7180_out: endpoint {
-						bus-width = <8>;
 						remote-endpoint = <&vin1ep>;
 					};
 				};

arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts

@@ -308,8 +308,6 @@
 
 &switch {
 	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
 
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_eth3>, <&pins_eth4>, <&pins_mdio1>;

arch/arm/boot/dts/samsung/exynos4210-i9100.dts

@@ -853,6 +853,7 @@
 	#size-cells = <0>;
 
 	non-removable;
+	cap-power-off-card;
 	bus-width = <4>;
 	mmc-pwrseq = <&wlan_pwrseq>;
 	vmmc-supply = <&vtf_reg>;

arch/arm/boot/dts/samsung/exynos4210-trats.dts

@@ -518,6 +518,7 @@
 	#size-cells = <0>;
 
 	non-removable;
+	cap-power-off-card;
 	bus-width = <4>;
 	mmc-pwrseq = <&wlan_pwrseq>;
 	vmmc-supply = <&tflash_reg>;

arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts

@@ -610,6 +610,7 @@
 	#size-cells = <0>;
 
 	non-removable;
+	cap-power-off-card;
 	bus-width = <4>;
 	mmc-pwrseq = <&wlan_pwrseq>;
 	vmmc-supply = <&ldo5_reg>;

arch/arm/boot/dts/samsung/exynos4412-midas.dtsi

@@ -1440,6 +1440,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	non-removable;
+	cap-power-off-card;
 	bus-width = <4>;
 
 	mmc-pwrseq = <&wlan_pwrseq>;