Skip to content

Commit d7a0090

Browse files
mpempe
committed
Automatic merge of 'master' into merge (2024-02-18 10:41)
2 parents 35d5936 + f2667e0 commit d7a0090

File tree

440 files changed

+3332
-1805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+3332
-1805
lines changed

‎.mailmap

+5-4
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ Gao Xiang <[email protected]> <[email protected]>
191191
Gao Xiang <[email protected]> <[email protected]>
192192
Gao Xiang <[email protected]> <[email protected]>
193193
Gao Xiang <[email protected]> <[email protected]>
194-
Geliang Tang <[email protected]> <[email protected]>
195-
Geliang Tang <[email protected]> <[email protected]>
196-
Geliang Tang <[email protected]> <[email protected]>
197-
Geliang Tang <[email protected]> <[email protected]>
194+
Geliang Tang <[email protected]> <[email protected]>
195+
Geliang Tang <[email protected]> <[email protected]>
196+
Geliang Tang <[email protected]> <[email protected]>
197+
Geliang Tang <[email protected]> <[email protected]>
198+
Geliang Tang <[email protected]> <[email protected]>
198199
Georgi Djakov <[email protected]> <[email protected]>
199200
Gerald Schaefer <[email protected]> <[email protected]>
200201
Gerald Schaefer <[email protected]> <[email protected]>

‎Documentation/ABI/testing/sysfs-class-net-statistics

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/class/<iface>/statistics/collisions
1+
What: /sys/class/net/<iface>/statistics/collisions
22
Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: [email protected]
55
Description:
66
Indicates the number of collisions seen by this network device.
77
This value might not be relevant with all MAC layers.
88

9-
What: /sys/class/<iface>/statistics/multicast
9+
What: /sys/class/net/<iface>/statistics/multicast
1010
Date: April 2005
1111
KernelVersion: 2.6.12
1212
Contact: [email protected]
1313
Description:
1414
Indicates the number of multicast packets received by this
1515
network device.
1616

17-
What: /sys/class/<iface>/statistics/rx_bytes
17+
What: /sys/class/net/<iface>/statistics/rx_bytes
1818
Date: April 2005
1919
KernelVersion: 2.6.12
2020
Contact: [email protected]
@@ -23,7 +23,7 @@ Description:
2323
See the network driver for the exact meaning of when this
2424
value is incremented.
2525

26-
What: /sys/class/<iface>/statistics/rx_compressed
26+
What: /sys/class/net/<iface>/statistics/rx_compressed
2727
Date: April 2005
2828
KernelVersion: 2.6.12
2929
Contact: [email protected]
@@ -32,7 +32,7 @@ Description:
3232
network device. This value might only be relevant for interfaces
3333
that support packet compression (e.g: PPP).
3434

35-
What: /sys/class/<iface>/statistics/rx_crc_errors
35+
What: /sys/class/net/<iface>/statistics/rx_crc_errors
3636
Date: April 2005
3737
KernelVersion: 2.6.12
3838
Contact: [email protected]
@@ -41,7 +41,7 @@ Description:
4141
by this network device. Note that the specific meaning might
4242
depend on the MAC layer used by the interface.
4343

44-
What: /sys/class/<iface>/statistics/rx_dropped
44+
What: /sys/class/net/<iface>/statistics/rx_dropped
4545
Date: April 2005
4646
KernelVersion: 2.6.12
4747
Contact: [email protected]
@@ -51,15 +51,15 @@ Description:
5151
packet processing. See the network driver for the exact
5252
meaning of this value.
5353

54-
What: /sys/class/<iface>/statistics/rx_errors
54+
What: /sys/class/net/<iface>/statistics/rx_errors
5555
Date: April 2005
5656
KernelVersion: 2.6.12
5757
Contact: [email protected]
5858
Description:
5959
Indicates the number of receive errors on this network device.
6060
See the network driver for the exact meaning of this value.
6161

62-
What: /sys/class/<iface>/statistics/rx_fifo_errors
62+
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
6363
Date: April 2005
6464
KernelVersion: 2.6.12
6565
Contact: [email protected]
@@ -68,7 +68,7 @@ Description:
6868
network device. See the network driver for the exact
6969
meaning of this value.
7070

71-
What: /sys/class/<iface>/statistics/rx_frame_errors
71+
What: /sys/class/net/<iface>/statistics/rx_frame_errors
7272
Date: April 2005
7373
KernelVersion: 2.6.12
7474
Contact: [email protected]
@@ -78,7 +78,7 @@ Description:
7878
on the MAC layer protocol used. See the network driver for
7979
the exact meaning of this value.
8080

81-
What: /sys/class/<iface>/statistics/rx_length_errors
81+
What: /sys/class/net/<iface>/statistics/rx_length_errors
8282
Date: April 2005
8383
KernelVersion: 2.6.12
8484
Contact: [email protected]
@@ -87,7 +87,7 @@ Description:
8787
error, oversized or undersized. See the network driver for the
8888
exact meaning of this value.
8989

90-
What: /sys/class/<iface>/statistics/rx_missed_errors
90+
What: /sys/class/net/<iface>/statistics/rx_missed_errors
9191
Date: April 2005
9292
KernelVersion: 2.6.12
9393
Contact: [email protected]
@@ -96,15 +96,15 @@ Description:
9696
due to lack of capacity in the receive side. See the network
9797
driver for the exact meaning of this value.
9898

99-
What: /sys/class/<iface>/statistics/rx_nohandler
99+
What: /sys/class/net/<iface>/statistics/rx_nohandler
100100
Date: February 2016
101101
KernelVersion: 4.6
102102
Contact: [email protected]
103103
Description:
104104
Indicates the number of received packets that were dropped on
105105
an inactive device by the network core.
106106

107-
What: /sys/class/<iface>/statistics/rx_over_errors
107+
What: /sys/class/net/<iface>/statistics/rx_over_errors
108108
Date: April 2005
109109
KernelVersion: 2.6.12
110110
Contact: [email protected]
@@ -114,15 +114,15 @@ Description:
114114
(e.g: larger than MTU). See the network driver for the exact
115115
meaning of this value.
116116

117-
What: /sys/class/<iface>/statistics/rx_packets
117+
What: /sys/class/net/<iface>/statistics/rx_packets
118118
Date: April 2005
119119
KernelVersion: 2.6.12
120120
Contact: [email protected]
121121
Description:
122122
Indicates the total number of good packets received by this
123123
network device.
124124

125-
What: /sys/class/<iface>/statistics/tx_aborted_errors
125+
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
126126
Date: April 2005
127127
KernelVersion: 2.6.12
128128
Contact: [email protected]
@@ -132,7 +132,7 @@ Description:
132132
a medium collision). See the network driver for the exact
133133
meaning of this value.
134134

135-
What: /sys/class/<iface>/statistics/tx_bytes
135+
What: /sys/class/net/<iface>/statistics/tx_bytes
136136
Date: April 2005
137137
KernelVersion: 2.6.12
138138
Contact: [email protected]
@@ -143,7 +143,7 @@ Description:
143143
transmitted packets or all packets that have been queued for
144144
transmission.
145145

146-
What: /sys/class/<iface>/statistics/tx_carrier_errors
146+
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
147147
Date: April 2005
148148
KernelVersion: 2.6.12
149149
Contact: [email protected]
@@ -152,7 +152,7 @@ Description:
152152
because of carrier errors (e.g: physical link down). See the
153153
network driver for the exact meaning of this value.
154154

155-
What: /sys/class/<iface>/statistics/tx_compressed
155+
What: /sys/class/net/<iface>/statistics/tx_compressed
156156
Date: April 2005
157157
KernelVersion: 2.6.12
158158
Contact: [email protected]
@@ -161,7 +161,7 @@ Description:
161161
this might only be relevant for devices that support
162162
compression (e.g: PPP).
163163

164-
What: /sys/class/<iface>/statistics/tx_dropped
164+
What: /sys/class/net/<iface>/statistics/tx_dropped
165165
Date: April 2005
166166
KernelVersion: 2.6.12
167167
Contact: [email protected]
@@ -170,7 +170,7 @@ Description:
170170
See the driver for the exact reasons as to why the packets were
171171
dropped.
172172

173-
What: /sys/class/<iface>/statistics/tx_errors
173+
What: /sys/class/net/<iface>/statistics/tx_errors
174174
Date: April 2005
175175
KernelVersion: 2.6.12
176176
Contact: [email protected]
@@ -179,7 +179,7 @@ Description:
179179
a network device. See the driver for the exact reasons as to
180180
why the packets were dropped.
181181

182-
What: /sys/class/<iface>/statistics/tx_fifo_errors
182+
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
183183
Date: April 2005
184184
KernelVersion: 2.6.12
185185
Contact: [email protected]
@@ -188,7 +188,7 @@ Description:
188188
FIFO error. See the driver for the exact reasons as to why the
189189
packets were dropped.
190190

191-
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
191+
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
192192
Date: April 2005
193193
KernelVersion: 2.6.12
194194
Contact: [email protected]
@@ -197,7 +197,7 @@ Description:
197197
reported as heartbeat errors. See the driver for the exact
198198
reasons as to why the packets were dropped.
199199

200-
What: /sys/class/<iface>/statistics/tx_packets
200+
What: /sys/class/net/<iface>/statistics/tx_packets
201201
Date: April 2005
202202
KernelVersion: 2.6.12
203203
Contact: [email protected]
@@ -206,7 +206,7 @@ Description:
206206
device. See the driver for whether this reports the number of all
207207
attempted or successful transmissions.
208208

209-
What: /sys/class/<iface>/statistics/tx_window_errors
209+
What: /sys/class/net/<iface>/statistics/tx_window_errors
210210
Date: April 2005
211211
KernelVersion: 2.6.12
212212
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-nvmem-cells

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ KernelVersion: 6.5
44
Contact: Miquel Raynal <[email protected]>
55
Description:
66
The "cells" folder contains one file per cell exposed by the
7-
NVMEM device. The name of the file is: <name>@<where>, with
8-
<name> being the cell name and <where> its location in the NVMEM
9-
device, in hexadecimal (without the '0x' prefix, to mimic device
10-
tree node names). The length of the file is the size of the cell
11-
(when known). The content of the file is the binary content of
12-
the cell (may sometimes be ASCII, likely without trailing
13-
character).
7+
NVMEM device. The name of the file is: "<name>@<byte>,<bit>",
8+
with <name> being the cell name and <where> its location in
9+
the NVMEM device, in hexadecimal bytes and bits (without the
10+
'0x' prefix, to mimic device tree node names). The length of
11+
the file is the size of the cell (when known). The content of
12+
the file is the binary content of the cell (may sometimes be
13+
ASCII, likely without trailing character).
1414
Note: This file is only present if CONFIG_NVMEM_SYSFS
1515
is enabled.
1616

1717
Example::
1818

19-
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d
19+
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d,0
2020
00000000 54 4e 34 38 4d 2d 50 2d 44 4e |TN48M-P-DN|
2121
0000000a

‎Documentation/arch/arm64/silicon-errata.rst

+7
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,10 @@ stable kernels.
243243
+----------------+-----------------+-----------------+-----------------------------+
244244
| ASR | ASR8601 | #8601001 | N/A |
245245
+----------------+-----------------+-----------------+-----------------------------+
246+
+----------------+-----------------+-----------------+-----------------------------+
247+
| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 |
248+
+----------------+-----------------+-----------------+-----------------------------+
249+
| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 |
250+
+----------------+-----------------+-----------------+-----------------------------+
251+
| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
252+
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/devicetree/bindings/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
2828
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
2929
-name 'processed-schema*' \)
3030

31-
find_cmd = $(find_all_cmd) | sed 's|^$(srctree)/$(src)/||' | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | sed 's|^|$(srctree)/$(src)/|'
31+
find_cmd = $(find_all_cmd) | \
32+
sed 's|^$(srctree)/||' | \
33+
grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | \
34+
sed 's|^|$(srctree)/|'
3235
CHK_DT_DOCS := $(shell $(find_cmd))
3336

3437
quiet_cmd_yamllint = LINT $(src)

‎Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Ceva AHCI SATA Controller
88

99
maintainers:
10-
- Piyush Mehta <[email protected]>
10+
- Mubin Sayyed <[email protected]>
11+
- Radhey Shyam Pandey <[email protected]>
1112

1213
description: |
1314
The Ceva SATA controller mostly conforms to the AHCI interface with some

‎Documentation/devicetree/bindings/display/bridge/nxp,tda998x.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,22 @@ properties:
2929

3030
audio-ports:
3131
description:
32-
Array of 8-bit values, 2 values per DAI (Documentation/sound/soc/dai.rst).
32+
Array of 2 values per DAI (Documentation/sound/soc/dai.rst).
3333
The implementation allows one or two DAIs.
3434
If two DAIs are defined, they must be of different type.
3535
$ref: /schemas/types.yaml#/definitions/uint32-matrix
36+
minItems: 1
37+
maxItems: 2
3638
items:
37-
minItems: 1
3839
items:
3940
- description: |
4041
The first value defines the DAI type: TDA998x_SPDIF or TDA998x_I2S
4142
(see include/dt-bindings/display/tda998x.h).
43+
enum: [ 1, 2 ]
4244
- description:
4345
The second value defines the tda998x AP_ENA reg content when the
4446
DAI in question is used.
47+
maximum: 0xff
4548

4649
'#sound-dai-cells':
4750
enum: [ 0, 1 ]

‎Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ description:
1212
PS_MODE). Every pin can be configured as input/output.
1313

1414
maintainers:
15-
- Piyush Mehta <[email protected]>
15+
- Mubin Sayyed <[email protected]>
16+
- Radhey Shyam Pandey <[email protected]>
1617

1718
properties:
1819
compatible:

‎Documentation/devicetree/bindings/net/marvell,prestera.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ examples:
7878
pcie@0 {
7979
#address-cells = <3>;
8080
#size-cells = <2>;
81-
ranges = <0x0 0x0 0x0 0x0 0x0 0x0>;
82-
reg = <0x0 0x0 0x0 0x0 0x0 0x0>;
81+
ranges = <0x02000000 0x0 0x100000 0x10000000 0x0 0x0>;
82+
reg = <0x0 0x1000>;
8383
device_type = "pci";
8484
8585
switch@0,0 {

‎Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Zynq UltraScale+ MPSoC and Versal reset
88

99
maintainers:
10-
- Piyush Mehta <[email protected]>
10+
- Mubin Sayyed <[email protected]>
11+
- Radhey Shyam Pandey <[email protected]>
1112

1213
description: |
1314
The Zynq UltraScale+ MPSoC and Versal has several different resets.

‎Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Google SC7280-Herobrine ASoC sound card driver
88

99
maintainers:
10-
- Srinivasa Rao Mandadapu <[email protected]>
1110
- Judy Hsiao <[email protected]>
1211

1312
description:

‎Documentation/devicetree/bindings/tpm/tpm-common.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242

4343
resets:
4444
description: Reset controller to reset the TPM
45-
$ref: /schemas/types.yaml#/definitions/phandle
45+
maxItems: 1
4646

4747
reset-gpios:
4848
description: Output GPIO pin to reset the TPM

‎Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ properties:
5555

5656
samsung,sysreg:
5757
$ref: /schemas/types.yaml#/definitions/phandle-array
58-
description: Should be phandle/offset pair. The phandle to the syscon node
59-
which indicates the FSYSx sysreg interface and the offset of
60-
the control register for UFS io coherency setting.
58+
items:
59+
- items:
60+
- description: phandle to FSYSx sysreg node
61+
- description: offset of the control register for UFS io coherency setting
62+
description:
63+
Phandle and offset to the FSYSx sysreg for UFS io coherency setting.
6164

6265
dma-coherent: true
6366

‎Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx SuperSpeed DWC3 USB SoC controller
88

99
maintainers:
10-
- Piyush Mehta <[email protected]>
10+
- Mubin Sayyed <[email protected]>
11+
- Radhey Shyam Pandey <[email protected]>
1112

1213
properties:
1314
compatible:

‎Documentation/devicetree/bindings/usb/microchip,usb5744.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ description:
1616
USB 2.0 traffic.
1717

1818
maintainers:
19-
- Piyush Mehta <[email protected]>
2019
- Michal Simek <[email protected]>
20+
- Mubin Sayyed <[email protected]>
21+
- Radhey Shyam Pandey <[email protected]>
2122

2223
properties:
2324
compatible:

0 commit comments

Comments
 (0)