Skip to content

Commit 1e78b9d

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.16.y' into v6.16+
2 parents 4ac22c5 + 3e0969c commit 1e78b9d

677 files changed

Lines changed: 7139 additions & 3478 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ modules.order
114114
!.gitignore
115115
!.kunitconfig
116116
!.mailmap
117+
!.pylintrc
117118
!.rustfmt.toml
118119

119120
#

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,14 @@
633633
named mounts. Specifying both "all" and "named" disables
634634
all v1 hierarchies.
635635

636+
cgroup_v1_proc= [KNL] Show also missing controllers in /proc/cgroups
637+
Format: { "true" | "false" }
638+
/proc/cgroups lists only v1 controllers by default.
639+
This compatibility option enables listing also v2
640+
controllers (whose v1 code is not compiled!), so that
641+
semi-legacy software can check this file to decide
642+
about usage of v2 (sic) controllers.
643+
636644
cgroup_favordynmods= [KNL] Enable or Disable favordynmods.
637645
Format: { "true" | "false" }
638646
Defaults to the value of CONFIG_CGROUP_FAVOR_DYNMODS.

Documentation/filesystems/f2fs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota
238238
grpjquota=<file> information can be properly updated during recovery flow,
239239
prjjquota=<file> <quota file>: must be in root directory;
240240
jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
241-
offusrjquota Turn off user journalled quota.
242-
offgrpjquota Turn off group journalled quota.
243-
offprjjquota Turn off project journalled quota.
241+
usrjquota= Turn off user journalled quota.
242+
grpjquota= Turn off group journalled quota.
243+
prjjquota= Turn off project journalled quota.
244244
quota Enable plain user disk quota accounting.
245245
noquota Disable all plain disk quota option.
246246
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
@@ -2107,16 +2107,16 @@ operations:
21072107

21082108
do: &module-eeprom-get-op
21092109
request:
2110-
attributes:
2111-
- header
2112-
reply:
21132110
attributes:
21142111
- header
21152112
- offset
21162113
- length
21172114
- page
21182115
- bank
21192116
- i2c-address
2117+
reply:
2118+
attributes:
2119+
- header
21202120
- data
21212121
dump: *module-eeprom-get-op
21222122
-

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 = 16
4-
SUBLEVEL = 0
4+
SUBLEVEL = 1
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/arm/boot/dts/microchip/sam9x7.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@
4545
clocks {
4646
slow_xtal: clock-slowxtal {
4747
compatible = "fixed-clock";
48+
clock-output-names = "slow_xtal";
4849
#clock-cells = <0>;
4950
};
5051

5152
main_xtal: clock-mainxtal {
5253
compatible = "fixed-clock";
54+
clock-output-names = "main_xtal";
5355
#clock-cells = <0>;
5456
};
5557
};

arch/arm/boot/dts/microchip/sama7d65.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@
3838
clocks {
3939
main_xtal: clock-mainxtal {
4040
compatible = "fixed-clock";
41+
clock-output-names = "main_xtal";
4142
#clock-cells = <0>;
4243
};
4344

4445
slow_xtal: clock-slowxtal {
4546
compatible = "fixed-clock";
47+
clock-output-names = "slow_xtal";
4648
#clock-cells = <0>;
4749
};
4850
};

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
@@ -168,7 +168,6 @@
168168
pinctrl-0 = <&pinctrl_uart2>;
169169
linux,rs485-enabled-at-boot-time;
170170
rs485-rx-during-tx;
171-
rs485-rts-active-low;
172171
uart-has-rtscts;
173172
status = "okay";
174173
};

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

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

604604
ftm: ftm@400b8000 {
605605
compatible = "fsl,ftm-timer";
606-
reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
606+
reg = <0x400b8000 0x1000>, <0x400b9000 0x1000>;
607607
interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
608608
clock-names = "ftm-evt", "ftm-src",
609609
"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]",

0 commit comments

Comments
 (0)