Skip to content

Commit fb6a1c2

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.142' into 6.1-main
This is the 6.1.142 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmhebXoACgkQONu9yGCS # aT4naA/9Fbb6FwpVetWdmtwwikNwka8/LumQiZlVmcSZLQmdMnTli8onXtFzuPkC # Wyw7fXNQA5cUpuw9tKqEPCydJESHlFQ6eWo0awbPzPxIyBo+RDbh0D9gkPh8trwZ # IDVZR+m8X4kkaBxF6lNYZ1mz9puFWljOiMGWOmZxiyYiLJq2ZF7DIACrTDr1QXt9 # h8/uoHe4thrRuDLktjdinWUMwi/FPizszfmR05K6OKBEOitgHYEC94eA0kZUC4Gp # ANZx0B5Y3vvT4oxndp/BvAWOepoSBAmNaldmH4G29SnDo7qGFkIcNHBHS93TH9KW # I78DZ9XNroG0KlHeUipQp+y05tx9XSZGmpPx4FniHoijx2CkwkAov5j14ST0L+RJ # 9FuOW00pWV0zCMZXj/3CxzBgBR+NjshdIuHVLpKVD9l/9NGIU8XBIM+YaNId9oTy # xK/JAkLgssYkGWErrgSx4558zAjPUfW+Yv+YX2MdxhviaMNWrO4pTtGnUfXKSWa2 # 53ASB05m9bH4qOYGjISfYKprCs9doGYkMK7sWfYuSxguW6Y4svjUSV2c1SjhCSb8 # Vzt2HyueuWTU5gaDuAIG4YR5nI4Tw1JI1tHWep9qiHfPoW4N9fLxS19vtN6oTKEB # 6HmIlKdx9exhf5Bhg2XelGxX88MQG5gDTxZTPbBe3iA6jalgyUo= # =a1o9 # -----END PGP SIGNATURE----- # gpg: Signature made Fri Jun 27 12:07:54 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 43a67ea + 7e69c33 commit fb6a1c2

499 files changed

Lines changed: 4440 additions & 2092 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/ABI/testing/sysfs-fs-xfs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/fs/xfs/<disk>/log/log_head_lsn
22
Date: July 2014
33
KernelVersion: 3.17
4-
Contact: xfs@oss.sgi.com
4+
Contact: linux-xfs@vger.kernel.org
55
Description:
66
The log sequence number (LSN) of the current head of the
77
log. The LSN is exported in "cycle:basic block" format.
@@ -10,15 +10,15 @@ Users: xfstests
1010
What: /sys/fs/xfs/<disk>/log/log_tail_lsn
1111
Date: July 2014
1212
KernelVersion: 3.17
13-
Contact: xfs@oss.sgi.com
13+
Contact: linux-xfs@vger.kernel.org
1414
Description:
1515
The log sequence number (LSN) of the current tail of the
1616
log. The LSN is exported in "cycle:basic block" format.
1717

1818
What: /sys/fs/xfs/<disk>/log/reserve_grant_head
1919
Date: July 2014
2020
KernelVersion: 3.17
21-
Contact: xfs@oss.sgi.com
21+
Contact: linux-xfs@vger.kernel.org
2222
Description:
2323
The current state of the log reserve grant head. It
2424
represents the total log reservation of all currently
@@ -29,7 +29,7 @@ Users: xfstests
2929
What: /sys/fs/xfs/<disk>/log/write_grant_head
3030
Date: July 2014
3131
KernelVersion: 3.17
32-
Contact: xfs@oss.sgi.com
32+
Contact: linux-xfs@vger.kernel.org
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5780,8 +5780,6 @@
57805780

57815781
Selecting 'on' will also enable the mitigation
57825782
against user space to user space task attacks.
5783-
Selecting specific mitigation does not force enable
5784-
user mitigations.
57855783

57865784
Selecting 'off' will disable both the kernel and
57875785
the user space protections.

‎Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ properties:
103103

104104
resets:
105105
items:
106-
- description: module reset
106+
- description:
107+
Module reset. This property is optional for controllers in Tegra194,
108+
Tegra234 etc where an internal software reset is available as an
109+
alternative.
107110

108111
reset-names:
109112
items:
@@ -119,6 +122,13 @@ properties:
119122
- const: rx
120123
- const: tx
121124

125+
required:
126+
- compatible
127+
- reg
128+
- interrupts
129+
- clocks
130+
- clock-names
131+
122132
allOf:
123133
- $ref: /schemas/i2c/i2c-controller.yaml
124134
- if:
@@ -172,6 +182,18 @@ allOf:
172182
items:
173183
- description: phandle to the VENC power domain
174184

185+
- if:
186+
not:
187+
properties:
188+
compatible:
189+
contains:
190+
enum:
191+
- nvidia,tegra194-i2c
192+
then:
193+
required:
194+
- resets
195+
- reset-names
196+
175197
unevaluatedProperties: false
176198

177199
examples:

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ patternProperties:
725725
description: Linux-specific binding
726726
"^linx,.*":
727727
description: Linx Technologies
728+
"^liontron,.*":
729+
description: Shenzhen Liontron Technology Co., Ltd
728730
"^liteon,.*":
729731
description: LITE-ON Technology Corp.
730732
"^litex,.*":

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 141
4+
SUBLEVEL = 142
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

@@ -1139,8 +1139,8 @@ LDFLAGS_vmlinux += --orphan-handling=warn
11391139
endif
11401140

11411141
# Align the bit size of userspace programs with the kernel
1142-
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1143-
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1142+
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1143+
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11441144

11451145
# userspace programs are linked via the compiler, use the correct linker
11461146
ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy)

‎arch/arm/boot/dts/am335x-bone-common.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
/* MDIO */
146146
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
147147
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
148+
/* Added to support GPIO controlled PHY reset */
149+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)
148150
>;
149151
};
150152

@@ -153,6 +155,8 @@
153155
/* MDIO reset value */
154156
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
155157
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
158+
/* Added to support GPIO controlled PHY reset */
159+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
156160
>;
157161
};
158162

@@ -377,6 +381,10 @@
377381

378382
ethphy0: ethernet-phy@0 {
379383
reg = <0>;
384+
/* Support GPIO reset on revision C3 boards */
385+
reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
386+
reset-assert-us = <300>;
387+
reset-deassert-us = <50000>;
380388
};
381389
};
382390

‎arch/arm/boot/dts/at91sam9263ek.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
nand@3 {
153153
reg = <0x3 0x0 0x800000>;
154154
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
155-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
155+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
156156
nand-bus-width = <8>;
157157
nand-ecc-mode = "soft";
158158
nand-on-flash-bbt;

‎arch/arm/boot/dts/qcom-apq8064.dtsi‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,6 @@
212212
};
213213
};
214214

215-
sfpb_mutex: hwmutex {
216-
compatible = "qcom,sfpb-mutex";
217-
syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
218-
#hwlock-cells = <1>;
219-
};
220-
221215
smem {
222216
compatible = "qcom,smem";
223217
memory-region = <&smem_region>;
@@ -361,9 +355,10 @@
361355
pinctrl-0 = <&ps_hold>;
362356
};
363357

364-
sfpb_wrapper_mutex: syscon@1200000 {
365-
compatible = "syscon";
366-
reg = <0x01200000 0x8000>;
358+
sfpb_mutex: hwmutex@1200600 {
359+
compatible = "qcom,sfpb-mutex";
360+
reg = <0x01200600 0x100>;
361+
#hwlock-cells = <1>;
367362
};
368363

369364
intc: interrupt-controller@2000000 {

‎arch/arm/boot/dts/tny_a9263.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
nand@3 {
6565
reg = <0x3 0x0 0x800000>;
6666
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
67-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
67+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
6868
nand-bus-width = <8>;
6969
nand-ecc-mode = "soft";
7070
nand-on-flash-bbt;

‎arch/arm/boot/dts/usb_a9263.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
};
5959

6060
spi0: spi@fffa4000 {
61-
cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
61+
cs-gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
6262
status = "okay";
6363
flash@0 {
6464
compatible = "atmel,at45", "atmel,dataflash";
@@ -84,7 +84,7 @@
8484
nand@3 {
8585
reg = <0x3 0x0 0x800000>;
8686
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
87-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
87+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
8888
nand-bus-width = <8>;
8989
nand-ecc-mode = "soft";
9090
nand-on-flash-bbt;

0 commit comments

Comments
 (0)