Skip to content

Commit 7c2bfd8

Browse files
fbqfbq
committed
Merge branch 'for-next/rust-for-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into rust-dev
2 parents 768409c + 724a75a commit 7c2bfd8

File tree

834 files changed

+9275
-5402
lines changed

Some content is hidden

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

834 files changed

+9275
-5402
lines changed

‎CREDITS

+13
Original file line numberDiff line numberDiff line change
@@ -2161,6 +2161,19 @@ N: Mike Kravetz
21612161
E: [email protected]
21622162
D: Maintenance and development of the hugetlb subsystem
21632163

2164+
N: Seth Jennings
2165+
E: [email protected]
2166+
D: Creation and maintenance of zswap
2167+
2168+
N: Dan Streetman
2169+
E: [email protected]
2170+
D: Maintenance and development of zswap
2171+
D: Creation and maintenance of the zpool API
2172+
2173+
N: Vitaly Wool
2174+
E: [email protected]
2175+
D: Maintenance and development of zswap
2176+
21642177
N: Andreas S. Krebs
21652178
E: [email protected]
21662179
D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards

‎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
Contact: [email protected]
@@ -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
Contact: [email protected]
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
Contact: [email protected]
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
Contact: [email protected]
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
Contact: [email protected]
@@ -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
Contact: [email protected]
@@ -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
Contact: [email protected]
@@ -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
Contact: [email protected]
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
Contact: [email protected]
@@ -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
Contact: [email protected]
@@ -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
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
1+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
22
Date: February 2023
33
KernelVersion: 6.2
44
Contact: [email protected]
55
Description: RO. Current Voltage in millivolt.
66

77
Only supported for particular Intel i915 graphics platforms.
88

9-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
9+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max
1010
Date: February 2023
1111
KernelVersion: 6.2
1212
Contact: [email protected]
@@ -20,15 +20,15 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts.
2020

2121
Only supported for particular Intel i915 graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
23+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max
2424
Date: February 2023
2525
KernelVersion: 6.2
2626
Contact: [email protected]
2727
Description: RO. Card default power limit (default TDP setting).
2828

2929
Only supported for particular Intel i915 graphics platforms.
3030

31-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
31+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval
3232
Date: February 2023
3333
KernelVersion: 6.2
3434
Contact: [email protected]
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in
3737

3838
Only supported for particular Intel i915 graphics platforms.
3939

40-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
40+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit
4141
Date: February 2023
4242
KernelVersion: 6.2
4343
Contact: [email protected]
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
5050

5151
Only supported for particular Intel i915 graphics platforms.
5252

53-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
53+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit
5454
Date: February 2023
5555
KernelVersion: 6.2
5656
Contact: [email protected]
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
6363

6464
Only supported for particular Intel i915 graphics platforms.
6565

66-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
66+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input
6767
Date: February 2023
6868
KernelVersion: 6.2
6969
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
1+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max
22
Date: September 2023
33
KernelVersion: 6.5
44
Contact: [email protected]
@@ -12,15 +12,15 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts.
1212

1313
Only supported for particular Intel xe graphics platforms.
1414

15-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
15+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max
1616
Date: September 2023
1717
KernelVersion: 6.5
1818
Contact: [email protected]
1919
Description: RO. Card default power limit (default TDP setting).
2020

2121
Only supported for particular Intel xe graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
23+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
2424
Date: September 2023
2525
KernelVersion: 6.5
2626
Contact: [email protected]
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
3333

3434
Only supported for particular Intel xe graphics platforms.
3535

36-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
36+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
3737
Date: September 2023
3838
KernelVersion: 6.5
3939
Contact: [email protected]
@@ -44,23 +44,23 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
4444
the operating frequency if the power averaged over a window
4545
exceeds this limit.
4646

47-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
47+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input
4848
Date: September 2023
4949
KernelVersion: 6.5
5050
Contact: [email protected]
5151
Description: RO. Current Voltage in millivolt.
5252

5353
Only supported for particular Intel xe graphics platforms.
5454

55-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
55+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
5656
Date: September 2023
5757
KernelVersion: 6.5
5858
Contact: [email protected]
5959
Description: RO. Energy input of device in microjoules.
6060

6161
Only supported for particular Intel xe graphics platforms.
6262

63-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
63+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
6464
Date: October 2023
6565
KernelVersion: 6.6
6666
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-platform-silicom

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ What: /sys/devices/platform/silicom-platform/power_cycle
1010
Date: November 2023
1111
KernelVersion: 6.7
1212
Contact: Henry Shi <[email protected]>
13+
Description:
1314
This file allow user to power cycle the platform.
1415
Default value is 0; when set to 1, it powers down
1516
the platform, waits 5 seconds, then powers on the

‎Documentation/accel/introduction.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ External References
101101
email threads
102102
-------------
103103

104-
* `Initial discussion on the New subsystem for acceleration devices <https://lkml.org/lkml/2022/7/31/83>`_ - Oded Gabbay (2022)
105-
* `patch-set to add the new subsystem <https://lkml.org/lkml/2022/10/22/544>`_ - Oded Gabbay (2022)
104+
* `Initial discussion on the New subsystem for acceleration devices <https://lore.kernel.org/lkml/CAFCwf11=9qpNAepL7NL+YAV_QO=Wv6pnWPhKHKAepK3fNn+2Dg@mail.gmail.com/>`_ - Oded Gabbay (2022)
105+
* `patch-set to add the new subsystem <https://lore.kernel.org/lkml/[email protected]/>`_ - Oded Gabbay (2022)
106106

107107
Conference talks
108108
----------------

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

-5
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,3 @@ bytes respectively. Such letter suffixes can also be entirely omitted:
218218

219219
.. include:: kernel-parameters.txt
220220
:literal:
221-
222-
Todo
223-
----
224-
225-
Add more DRM drivers.

‎Documentation/admin-guide/kernel-per-CPU-kthreads.rst

+6-10
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,9 @@ To reduce its OS jitter, do any of the following:
243243
3. Do any of the following needed to avoid jitter that your
244244
application cannot tolerate:
245245

246-
a. Build your kernel with CONFIG_SLUB=y rather than
247-
CONFIG_SLAB=y, thus avoiding the slab allocator's periodic
248-
use of each CPU's workqueues to run its cache_reap()
249-
function.
250-
b. Avoid using oprofile, thus avoiding OS jitter from
246+
a. Avoid using oprofile, thus avoiding OS jitter from
251247
wq_sync_buffer().
252-
c. Limit your CPU frequency so that a CPU-frequency
248+
b. Limit your CPU frequency so that a CPU-frequency
253249
governor is not required, possibly enlisting the aid of
254250
special heatsinks or other cooling technologies. If done
255251
correctly, and if you CPU architecture permits, you should
@@ -259,7 +255,7 @@ To reduce its OS jitter, do any of the following:
259255

260256
WARNING: Please check your CPU specifications to
261257
make sure that this is safe on your particular system.
262-
d. As of v3.18, Christoph Lameter's on-demand vmstat workers
258+
c. As of v3.18, Christoph Lameter's on-demand vmstat workers
263259
commit prevents OS jitter due to vmstat_update() on
264260
CONFIG_SMP=y systems. Before v3.18, is not possible
265261
to entirely get rid of the OS jitter, but you can
@@ -274,20 +270,20 @@ To reduce its OS jitter, do any of the following:
274270
(based on an earlier one from Gilad Ben-Yossef) that
275271
reduces or even eliminates vmstat overhead for some
276272
workloads at https://lore.kernel.org/r/00000140e9dfd6bd-40db3d4f-c1be-434f-8132-7820f81bb586-000000@email.amazonses.com.
277-
e. If running on high-end powerpc servers, build with
273+
d. If running on high-end powerpc servers, build with
278274
CONFIG_PPC_RTAS_DAEMON=n. This prevents the RTAS
279275
daemon from running on each CPU every second or so.
280276
(This will require editing Kconfig files and will defeat
281277
this platform's RAS functionality.) This avoids jitter
282278
due to the rtas_event_scan() function.
283279
WARNING: Please check your CPU specifications to
284280
make sure that this is safe on your particular system.
285-
f. If running on Cell Processor, build your kernel with
281+
e. If running on Cell Processor, build your kernel with
286282
CBE_CPUFREQ_SPU_GOVERNOR=n to avoid OS jitter from
287283
spu_gov_work().
288284
WARNING: Please check your CPU specifications to
289285
make sure that this is safe on your particular system.
290-
g. If running on PowerMAC, build your kernel with
286+
f. If running on PowerMAC, build your kernel with
291287
CONFIG_PMAC_RACKMETER=n to disable the CPU-meter,
292288
avoiding OS jitter from rackmeter_do_timer().
293289

‎Documentation/dev-tools/kunit/usage.rst

+17-2
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,23 @@ Testing Static Functions
671671
------------------------
672672

673673
If we do not want to expose functions or variables for testing, one option is to
674-
conditionally ``#include`` the test file at the end of your .c file. For
675-
example:
674+
conditionally export the used symbol. For example:
675+
676+
.. code-block:: c
677+
678+
/* In my_file.c */
679+
680+
VISIBLE_IF_KUNIT int do_interesting_thing();
681+
EXPORT_SYMBOL_IF_KUNIT(do_interesting_thing);
682+
683+
/* In my_file.h */
684+
685+
#if IS_ENABLED(CONFIG_KUNIT)
686+
int do_interesting_thing(void);
687+
#endif
688+
689+
Alternatively, you could conditionally ``#include`` the test file at the end of
690+
your .c file. For example:
676691

677692
.. code-block:: c
678693

‎Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ allOf:
8585
clocks:
8686
minItems: 6
8787
maxItems: 6
88-
regs:
88+
reg:
8989
minItems: 2
9090
maxItems: 2
9191

@@ -99,7 +99,7 @@ allOf:
9999
clocks:
100100
minItems: 4
101101
maxItems: 4
102-
regs:
102+
reg:
103103
minItems: 2
104104
maxItems: 2
105105

@@ -116,7 +116,7 @@ allOf:
116116
clocks:
117117
minItems: 3
118118
maxItems: 3
119-
regs:
119+
reg:
120120
minItems: 1
121121
maxItems: 1
122122

‎Documentation/devicetree/bindings/media/cnm,wave521c.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ properties:
1717
compatible:
1818
items:
1919
- enum:
20-
- ti,k3-j721s2-wave521c
20+
- ti,j721s2-wave521c
2121
- const: cnm,wave521c
2222

2323
reg:
@@ -53,7 +53,7 @@ additionalProperties: false
5353
examples:
5454
- |
5555
vpu: video-codec@12345678 {
56-
compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c";
56+
compatible = "ti,j721s2-wave521c", "cnm,wave521c";
5757
reg = <0x12345678 0x1000>;
5858
clocks = <&clks 42>;
5959
interrupts = <42>;

0 commit comments

Comments
 (0)