Merge tag 'v6.1.148' into 6.1-main

This is the 6.1.148 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmifBtoACgkQONu9yGCS
# aT4IIw//f/Lrts2+dre5xMP5vGninbZYyg7uuibuD6IVD1GSWq39to2gEHh05f/j
# xxpG0W06k/r7rcN1aFUamoPgMgv9LGRkvscjbgGnLRrx2jrJB/NadQAJXW9x6pG5
# 8aqxlFi9+H/wUfJxWmkb48BR44Lh7QoBMayikNipqEo4ZMcquR0cdSE2fr0523oU
# oT7jQZucTg06IVvHwyIGtjI9qlcHg3puNYp5QOl6TJERi6KP1feDkmqvzJQGbPcG
# AufqpDWFJXaIEbkvO5k8SkjtBBdOmTH7t23Abo/G6WL2o8+qeTtx9l/A3hWRwcND
# 52rw13HapWGG54s6+hD8YpBD+C7WRDwAf/FJLczFlBI+ZONrk1bVEzJk7wQn3Gvl
# aIB53HQ4Uj186Tzv8Sv2bgZkL66hH73OydtnJxbXApgTOJqDiG5XmhLVX+KvrI73
# 4nOb/Mu6gGmdgXip5frA/w0tn7By6VRkSgWsk3pcv8yq7KFiRdBjPkjI7vPNPBkV
# v7OUYn3a12wFK0WJpao9EkA0aF4Kt9aLLPtnexYOAY7t8JE2KI8e4RA2wn8Nn1qU
# cY8BygH3W4qL5cELFc2bei5s9uj3FQ5qAPDbDGrfI5g4TOT1xo5cMii3M32QLA1t
# I90tLZAdJsC2K+2LRyv5IzvR5XRK4nwufqh8a6aAZCIjogIi9m8=
# =aY5J
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Aug 15 12:07:22 2025 CEST
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Author: frank-w

Documentation/filesystems/f2fs.rst

@@ -230,9 +230,9 @@ usrjquota=<file>	 Appoint specified file and type during mount, so that quota
 grpjquota=<file>	 information can be properly updated during recovery flow,
 prjjquota=<file>	 <quota file>: must be in root directory;
 jqfmt=<quota type>	 <quota type>: [vfsold,vfsv0,vfsv1].
-offusrjquota		 Turn off user journalled quota.
-offgrpjquota		 Turn off group journalled quota.
-offprjjquota		 Turn off project journalled quota.
+usrjquota=		 Turn off user journalled quota.
+grpjquota=		 Turn off group journalled quota.
+prjjquota=		 Turn off project journalled quota.
 quota			 Enable plain user disk quota accounting.
 noquota			 Disable all plain disk quota option.
 alloc_mode=%s		 Adjust block allocation policy, which supports "reuse"

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 147
+SUBLEVEL = 148
 EXTRAVERSION =
 NAME = Curry Ramen
 

arch/arm/boot/dts/am335x-boneblack.dts

@@ -34,7 +34,7 @@
 		"P9_18 [spi0_d1]",
 		"P9_17 [spi0_cs0]",
 		"[mmc0_cd]",
-		"P8_42A [ecappwm0]",
+		"P9_42A [ecappwm0]",
 		"P8_35 [lcd d12]",
 		"P8_33 [lcd d13]",
 		"P8_31 [lcd d14]",

arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi

@@ -169,7 +169,6 @@
 	pinctrl-0 = <&pinctrl_uart2>;
 	linux,rs485-enabled-at-boot-time;
 	rs485-rx-during-tx;
-	rs485-rts-active-low;
 	uart-has-rtscts;
 	status = "okay";
 };

arch/arm/boot/dts/vfxxx.dtsi

@@ -617,7 +617,7 @@
 
 			ftm: ftm@400b8000 {
 				compatible = "fsl,ftm-timer";
-				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+				reg = <0x400b8000 0x1000>, <0x400b9000 0x1000>;
 				interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
 				clock-names = "ftm-evt", "ftm-src",
 					"ftm-evt-counter-en", "ftm-src-counter-en";

arch/arm/crypto/aes-neonbs-glue.c

@@ -245,7 +245,7 @@ static int ctr_encrypt(struct skcipher_request *req)
 	while (walk.nbytes > 0) {
 		const u8 *src = walk.src.virt.addr;
 		u8 *dst = walk.dst.virt.addr;
-		int bytes = walk.nbytes;
+		unsigned int bytes = walk.nbytes;
 
 		if (unlikely(bytes < AES_BLOCK_SIZE))
 			src = dst = memcpy(buf + sizeof(buf) - bytes,

arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi

@@ -284,6 +284,8 @@
 	pinctrl-0 = <&pinctrl_usdhc3>;
 	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+	assigned-clocks = <&clk IMX8MM_CLK_USDHC3>;
+	assigned-clock-rates = <400000000>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";

arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi

@@ -295,6 +295,8 @@
 	pinctrl-0 = <&pinctrl_usdhc3>;
 	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+	assigned-clocks = <&clk IMX8MN_CLK_USDHC3>;
+	assigned-clock-rates = <400000000>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";

arch/arm64/boot/dts/qcom/sc7180.dtsi

@@ -3244,18 +3244,18 @@
 			cell-index = <0>;
 		};
 
-		sram@146aa000 {
+		sram@14680000 {
 			compatible = "qcom,sc7180-imem", "syscon", "simple-mfd";
-			reg = <0 0x146aa000 0 0x2000>;
+			reg = <0 0x14680000 0 0x2e000>;
 
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			ranges = <0 0 0x146aa000 0x2000>;
+			ranges = <0 0 0x14680000 0x2e000>;
 
-			pil-reloc@94c {
+			pil-reloc@2a94c {
 				compatible = "qcom,pil-reloc-info";
-				reg = <0x94c 0xc8>;
+				reg = <0x2a94c 0xc8>;
 			};
 		};
 

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

@@ -4915,18 +4915,18 @@
 			cell-index = <0>;
 		};
 
-		sram@146bf000 {
+		sram@14680000 {
 			compatible = "qcom,sdm845-imem", "syscon", "simple-mfd";
-			reg = <0 0x146bf000 0 0x1000>;
+			reg = <0 0x14680000 0 0x40000>;
 
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			ranges = <0 0 0x146bf000 0x1000>;
+			ranges = <0 0 0x14680000 0x40000>;
 
-			pil-reloc@94c {
+			pil-reloc@3f94c {
 				compatible = "qcom,pil-reloc-info";
-				reg = <0x94c 0xc8>;
+				reg = <0x3f94c 0xc8>;
 			};
 		};