Skip to content

Commit 77002b5

Browse files
committed
Merge branch 'stable/linux-6.6.y' into linux-6.6-mchp
2 parents 82ac4c2 + 5c7587f commit 77002b5

File tree

2,198 files changed

+27504
-18030
lines changed

Some content is hidden

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

2,198 files changed

+27504
-18030
lines changed

Documentation/ABI/testing/sysfs-class-devfreq

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ Description:
5252

5353
echo 0 > /sys/class/devfreq/.../trans_stat
5454

55+
If the transition table is bigger than PAGE_SIZE, reading
56+
this will return an -EFBIG error.
57+
5558
What: /sys/class/devfreq/.../available_frequencies
5659
Date: October 2012
5760
Contact: Nishanth Menon <[email protected]>

Documentation/ABI/testing/sysfs-class-net-queues

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/class/<iface>/queues/rx-<queue>/rps_cpus
1+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_cpus
22
Date: March 2010
33
KernelVersion: 2.6.35
44
@@ -8,31 +8,31 @@ Description:
88
network device queue. Possible values depend on the number
99
of available CPU(s) in the system.
1010

11-
What: /sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt
11+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt
1212
Date: April 2010
1313
KernelVersion: 2.6.35
1414
1515
Description:
1616
Number of Receive Packet Steering flows being currently
1717
processed by this particular network device receive queue.
1818

19-
What: /sys/class/<iface>/queues/tx-<queue>/tx_timeout
19+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_timeout
2020
Date: November 2011
2121
KernelVersion: 3.3
2222
2323
Description:
2424
Indicates the number of transmit timeout events seen by this
2525
network interface transmit queue.
2626

27-
What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate
27+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate
2828
Date: March 2015
2929
KernelVersion: 4.1
3030
3131
Description:
3232
A Mbps max-rate set for the queue, a value of zero means disabled,
3333
default is disabled.
3434

35-
What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
35+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_cpus
3636
Date: November 2010
3737
KernelVersion: 2.6.38
3838
@@ -42,7 +42,7 @@ Description:
4242
network device transmit queue. Possible values depend on the
4343
number of available CPU(s) in the system.
4444

45-
What: /sys/class/<iface>/queues/tx-<queue>/xps_rxqs
45+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs
4646
Date: June 2018
4747
KernelVersion: 4.18.0
4848
@@ -53,7 +53,7 @@ Description:
5353
number of available receive queue(s) in the network device.
5454
Default is disabled.
5555

56-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
56+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
5757
Date: November 2011
5858
KernelVersion: 3.3
5959
@@ -62,15 +62,15 @@ Description:
6262
of this particular network device transmit queue.
6363
Default value is 1000.
6464

65-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
65+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
6666
Date: November 2011
6767
KernelVersion: 3.3
6868
6969
Description:
7070
Indicates the number of bytes (objects) in flight on this
7171
network device transmit queue.
7272

73-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit
73+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit
7474
Date: November 2011
7575
KernelVersion: 3.3
7676
@@ -79,7 +79,7 @@ Description:
7979
on this network device transmit queue. This value is clamped
8080
to be within the bounds defined by limit_max and limit_min.
8181

82-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
82+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
8383
Date: November 2011
8484
KernelVersion: 3.3
8585
@@ -88,7 +88,7 @@ Description:
8888
queued on this network device transmit queue. See
8989
include/linux/dynamic_queue_limits.h for the default value.
9090

91-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
91+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
9292
Date: November 2011
9393
KernelVersion: 3.3
9494

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
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
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
@@ -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
@@ -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
@@ -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
@@ -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
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
@@ -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
@@ -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
@@ -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
@@ -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
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
@@ -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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Documentation/ABI/testing/sysfs-devices-system-cpu

+1
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ What: /sys/devices/system/cpu/vulnerabilities
519519
/sys/devices/system/cpu/vulnerabilities/mds
520520
/sys/devices/system/cpu/vulnerabilities/meltdown
521521
/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
522+
/sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling
522523
/sys/devices/system/cpu/vulnerabilities/retbleed
523524
/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
524525
/sys/devices/system/cpu/vulnerabilities/spectre_v1

Documentation/admin-guide/abi-obsolete.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ marked to be removed at some later point in time.
77
The description of the interface will document the reason why it is
88
obsolete and when it can be expected to be removed.
99

10-
.. kernel-abi:: $srctree/Documentation/ABI/obsolete
10+
.. kernel-abi:: ABI/obsolete
1111
:rst:
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ABI removed symbols
22
===================
33

4-
.. kernel-abi:: $srctree/Documentation/ABI/removed
4+
.. kernel-abi:: ABI/removed
55
:rst:

Documentation/admin-guide/abi-stable.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ for at least 2 years.
1010
Most interfaces (like syscalls) are expected to never change and always
1111
be available.
1212

13-
.. kernel-abi:: $srctree/Documentation/ABI/stable
13+
.. kernel-abi:: ABI/stable
1414
:rst:

Documentation/admin-guide/abi-testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ Programs that use these interfaces are strongly encouraged to add their
1616
name to the description of these interfaces, so that the kernel
1717
developers can easily notify them if any changes occur.
1818

19-
.. kernel-abi:: $srctree/Documentation/ABI/testing
19+
.. kernel-abi:: ABI/testing
2020
:rst:
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.. SPDX-License-Identifier: GPL-2.0
22
3-
.. kernel-feat:: $srctree/Documentation/features
3+
.. kernel-feat:: features

Documentation/admin-guide/hw-vuln/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ are configurable at compile, boot or run time.
2121
cross-thread-rsb
2222
srso
2323
gather_data_sampling
24+
reg-file-data-sampling

0 commit comments

Comments
 (0)