Skip to content

Commit a906721

Browse files
committed
Merge tag 'v6.6.102' into 6.6-main
This is the 6.6.102 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmifB04ACgkQONu9yGCS # aT5TCA//dM4GG2Mqjd39wcG2yHajczNozULLflRGbWymoVsu5x26/8+9xJcCUkQf # ZKT3wVoWfsd3u4k+Fdv3bJtoBl+ILDuHDkagsNIH/9lUtk+ri8KOjV7Fo2ahHWtj # G2UgaFYT0fRkLMxNEOqSi7hFTjmI1A3CDOvJSH5JA/gYIe744jhrrDlnwsZRDau4 # FLzUlQMkwFH+15gLqNDf4AUMaRgAhE0Xxy+x/ZLfe+WAFsoJb4qYZpzv2Xet5kAC # eS/PS1AxbiAFbPNY499DMVJAOclk1UFxPtN3FPmbQOpsCmJnnDgLfK3Wk4dsGkly # KE5NyXZy0VxL7Te4iL8dEXANmh9SgtEftOvukf5kdKdeAwl2wH9vgHCNRDFOr9/l # WCwLSSmLytXNom8zDStMNoqK08oOl6dQiBvxuZpd+JXj4NjNzvVKQGmPZrU6bcYt # WGH5oFBDymtbfy18q1hb9MG/S6ae4t/MklWPXHntoEItzTqv4sXSfLhU6JGP3lKz # bjCKs+2QLSJ0rX8dhbnHTWw/AERUej2KPejHNu+Mv6iyol1UH0K6jWvUtUgnbCTa # JzR8C+kcbmJil4UI5lWl8SGDYnbaSw7C7qva5FrOWhc+J4NY46rYzz3GLg++Lk00 # 5lFYFC9dW84COTy5kfwqpxteHIglEtNJjxlAHmQPZXOEfjjLkmc= # =aKiw # -----END PGP SIGNATURE----- # gpg: Signature made Fri Aug 15 12:09:18 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 9e413e5 + bb9c90a commit a906721

287 files changed

Lines changed: 2609 additions & 1269 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.

Documentation/filesystems/f2fs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota
233233
grpjquota=<file> information can be properly updated during recovery flow,
234234
prjjquota=<file> <quota file>: must be in root directory;
235235
jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
236-
offusrjquota Turn off user journalled quota.
237-
offgrpjquota Turn off group journalled quota.
238-
offprjjquota Turn off project journalled quota.
236+
usrjquota= Turn off user journalled quota.
237+
grpjquota= Turn off group journalled quota.
238+
prjjquota= Turn off project journalled quota.
239239
quota Enable plain user disk quota accounting.
240240
noquota Disable all plain disk quota option.
241241
alloc_mode=%s Adjust block allocation policy, which supports "reuse"

Documentation/netlink/specs/ethtool.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,16 +1489,16 @@ operations:
14891489

14901490
do: &module-eeprom-get-op
14911491
request:
1492-
attributes:
1493-
- header
1494-
reply:
14951492
attributes:
14961493
- header
14971494
- offset
14981495
- length
14991496
- page
15001497
- bank
15011498
- i2c-address
1499+
reply:
1500+
attributes:
1501+
- header
15021502
- data
15031503
dump: *module-eeprom-get-op
15041504
-

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 = 6
4-
SUBLEVEL = 101
4+
SUBLEVEL = 102
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
pinctrl-0 = <&pinctrl_uart2>;
170170
linux,rs485-enabled-at-boot-time;
171171
rs485-rx-during-tx;
172-
rs485-rts-active-low;
173172
uart-has-rtscts;
174173
status = "okay";
175174
};

arch/arm/boot/dts/nxp/vf/vfxxx.dtsi

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

613613
ftm: ftm@400b8000 {
614614
compatible = "fsl,ftm-timer";
615-
reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
615+
reg = <0x400b8000 0x1000>, <0x400b9000 0x1000>;
616616
interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
617617
clock-names = "ftm-evt", "ftm-src",
618618
"ftm-evt-counter-en", "ftm-src-counter-en";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"P9_18 [spi0_d1]",
3636
"P9_17 [spi0_cs0]",
3737
"[mmc0_cd]",
38-
"P8_42A [ecappwm0]",
38+
"P9_42A [ecappwm0]",
3939
"P8_35 [lcd d12]",
4040
"P8_33 [lcd d13]",
4141
"P8_31 [lcd d14]",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int ctr_encrypt(struct skcipher_request *req)
245245
while (walk.nbytes > 0) {
246246
const u8 *src = walk.src.virt.addr;
247247
u8 *dst = walk.dst.virt.addr;
248-
int bytes = walk.nbytes;
248+
unsigned int bytes = walk.nbytes;
249249

250250
if (unlikely(bytes < AES_BLOCK_SIZE))
251251
src = dst = memcpy(buf + sizeof(buf) - bytes,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,8 @@
284284
pinctrl-0 = <&pinctrl_usdhc3>;
285285
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
286286
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
287+
assigned-clocks = <&clk IMX8MM_CLK_USDHC3>;
288+
assigned-clock-rates = <400000000>;
287289
bus-width = <8>;
288290
non-removable;
289291
status = "okay";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@
295295
pinctrl-0 = <&pinctrl_usdhc3>;
296296
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
297297
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
298+
assigned-clocks = <&clk IMX8MN_CLK_USDHC3>;
299+
assigned-clock-rates = <400000000>;
298300
bus-width = <8>;
299301
non-removable;
300302
status = "okay";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@
862862
clock-names = "bam_clk";
863863
#dma-cells = <1>;
864864
qcom,ee = <0>;
865+
qcom,controlled-remotely;
865866
};
866867

867868
blsp1_uart1: serial@78af000 {
@@ -982,6 +983,7 @@
982983
clock-names = "bam_clk";
983984
#dma-cells = <1>;
984985
qcom,ee = <0>;
986+
qcom,controlled-remotely;
985987
};
986988

987989
blsp2_uart2: serial@7af0000 {

0 commit comments

Comments
 (0)