Skip to content

Commit 9dfb40b

Browse files
authored
Merge pull request #34 from Rust-for-Linux/sync-5.9
Sync with v5.9
2 parents 91a7d3b + f9f8d51 commit 9dfb40b

File tree

2,515 files changed

+19765
-11430
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,515 files changed

+19765
-11430
lines changed

.clang-format

+12
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ ForEachMacros:
111111
- 'css_for_each_descendant_pre'
112112
- 'device_for_each_child_node'
113113
- 'dma_fence_chain_for_each'
114+
- 'do_for_each_ftrace_op'
114115
- 'drm_atomic_crtc_for_each_plane'
115116
- 'drm_atomic_crtc_state_for_each_plane'
116117
- 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros:
136137
- 'for_each_active_dev_scope'
137138
- 'for_each_active_drhd_unit'
138139
- 'for_each_active_iommu'
140+
- 'for_each_aggr_pgid'
139141
- 'for_each_available_child_of_node'
140142
- 'for_each_bio'
141143
- 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros:
234236
- 'for_each_node_state'
235237
- 'for_each_node_with_cpus'
236238
- 'for_each_node_with_property'
239+
- 'for_each_nonreserved_multicast_dest_pgid'
237240
- 'for_each_of_allnodes'
238241
- 'for_each_of_allnodes_from'
239242
- 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros:
256259
- 'for_each_pci_dev'
257260
- 'for_each_pci_msi_entry'
258261
- 'for_each_pcm_streams'
262+
- 'for_each_physmem_range'
259263
- 'for_each_populated_zone'
260264
- 'for_each_possible_cpu'
261265
- 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros:
265269
- 'for_each_process_thread'
266270
- 'for_each_property_of_node'
267271
- 'for_each_registered_fb'
272+
- 'for_each_requested_gpio'
273+
- 'for_each_requested_gpio_in_range'
268274
- 'for_each_reserved_mem_region'
269275
- 'for_each_rtd_codec_dais'
270276
- 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros:
278284
- 'for_each_sg'
279285
- 'for_each_sg_dma_page'
280286
- 'for_each_sg_page'
287+
- 'for_each_sgtable_dma_page'
288+
- 'for_each_sgtable_dma_sg'
289+
- 'for_each_sgtable_page'
290+
- 'for_each_sgtable_sg'
281291
- 'for_each_sibling_event'
282292
- 'for_each_subelement'
283293
- 'for_each_subelement_extid'
284294
- 'for_each_subelement_id'
285295
- '__for_each_thread'
286296
- 'for_each_thread'
297+
- 'for_each_unicast_dest_pgid'
287298
- 'for_each_wakeup_source'
288299
- 'for_each_zone'
289300
- 'for_each_zone_zonelist'
@@ -464,6 +475,7 @@ ForEachMacros:
464475
- 'v4l2_m2m_for_each_src_buf'
465476
- 'v4l2_m2m_for_each_src_buf_safe'
466477
- 'virtio_device_for_each_vq'
478+
- 'while_for_each_ftrace_op'
467479
- 'xa_for_each'
468480
- 'xa_for_each_marked'
469481
- 'xa_for_each_range'

.mailmap

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Andrew Murray <[email protected]> <[email protected]>
4141
Andrew Vasquez <[email protected]>
4242
4343
Andy Adamson <[email protected]>
44-
Antoine Tenart <[email protected]>
44+
45+
4546
4647
Archit Taneja <[email protected]>
4748
@@ -169,6 +170,10 @@ Juha Yrjola <[email protected]>
169170
170171
171172
Kay Sievers <[email protected]>
173+
174+
175+
176+
172177
Kenneth W Chen <[email protected]>
173178
Konstantin Khlebnikov <[email protected]> <[email protected]>
174179
Konstantin Khlebnikov <[email protected]> <[email protected]>
@@ -184,6 +189,7 @@ Leon Romanovsky <[email protected]> <[email protected]>
184189
Linas Vepstas <[email protected]>
185190
186191
192+
187193
188194
189195
@@ -308,6 +314,7 @@ Tony Luck <[email protected]>
308314
309315
310316
Tsuneo Yoshioka <[email protected]>
317+
311318
Uwe Kleine-König <[email protected]>
312319
Uwe Kleine-König <[email protected]>
313320
Uwe Kleine-König <[email protected]>

Documentation/RCU/lockdep.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives:
4949
is invoked by both RCU-sched readers and updaters.
5050
srcu_dereference_check(p, c):
5151
Use explicit check expression "c" along with
52-
srcu_read_lock_held()(). This is useful in code that
52+
srcu_read_lock_held(). This is useful in code that
5353
is invoked by both SRCU readers and updaters.
5454
rcu_dereference_raw(p):
5555
Don't check. (Use sparingly, if at all.)

Documentation/admin-guide/cgroup-v2.rst

+18-7
Original file line numberDiff line numberDiff line change
@@ -1324,15 +1324,26 @@ PAGE_SIZE multiple when read back.
13241324
pgmajfault
13251325
Number of major page faults incurred
13261326

1327-
workingset_refault
1328-
Number of refaults of previously evicted pages
1327+
workingset_refault_anon
1328+
Number of refaults of previously evicted anonymous pages.
13291329

1330-
workingset_activate
1331-
Number of refaulted pages that were immediately activated
1330+
workingset_refault_file
1331+
Number of refaults of previously evicted file pages.
13321332

1333-
workingset_restore
1334-
Number of restored pages which have been detected as an active
1335-
workingset before they got reclaimed.
1333+
workingset_activate_anon
1334+
Number of refaulted anonymous pages that were immediately
1335+
activated.
1336+
1337+
workingset_activate_file
1338+
Number of refaulted file pages that were immediately activated.
1339+
1340+
workingset_restore_anon
1341+
Number of restored anonymous pages which have been detected as
1342+
an active workingset before they got reclaimed.
1343+
1344+
workingset_restore_file
1345+
Number of restored file pages which have been detected as an
1346+
active workingset before they got reclaimed.
13361347

13371348
workingset_nodereclaim
13381349
Number of times a shadow node has been reclaimed

Documentation/admin-guide/device-mapper/dm-crypt.rst

+9-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Parameters::
6767
the value passed in <key_size>.
6868

6969
<key_type>
70-
Either 'logon' or 'user' kernel key type.
70+
Either 'logon', 'user' or 'encrypted' kernel key type.
7171

7272
<key_description>
7373
The kernel keyring key description crypt target should look for
@@ -121,6 +121,14 @@ submit_from_crypt_cpus
121121
thread because it benefits CFQ to have writes submitted using the
122122
same context.
123123

124+
no_read_workqueue
125+
Bypass dm-crypt internal workqueue and process read requests synchronously.
126+
127+
no_write_workqueue
128+
Bypass dm-crypt internal workqueue and process write requests synchronously.
129+
This option is automatically enabled for host-managed zoned block devices
130+
(e.g. host-managed SMR hard-disks).
131+
124132
integrity:<bytes>:<type>
125133
The device requires additional <bytes> metadata per-sector stored
126134
in per-bio integrity structure. This metadata must by provided

Documentation/admin-guide/devices.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@
16621662

16631663
98 block User-mode virtual block device
16641664
0 = /dev/ubda First user-mode block device
1665-
16 = /dev/udbb Second user-mode block device
1665+
16 = /dev/ubdb Second user-mode block device
16661666
...
16671667

16681668
Partitions are handled in the same way as for IDE

Documentation/admin-guide/dynamic-debug-howto.rst

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ against. Possible keywords are:::
156156
``line-range`` cannot contain space, e.g.
157157
"1-30" is valid range but "1 - 30" is not.
158158

159-
``module=foo`` combined keyword=value form is interchangably accepted
160159

161160
The meanings of each keyword are:
162161

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ on the feature, restricting the viewing angles.
14341434

14351435

14361436
DYTC Lapmode sensor
1437-
------------------
1437+
-------------------
14381438

14391439
sysfs: dytc_lapmode
14401440

Documentation/admin-guide/pm/cpuidle.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ which of the two parameters is added to the kernel command line. In the
690690
instruction of the CPUs (which, as a rule, suspends the execution of the program
691691
and causes the hardware to attempt to enter the shallowest available idle state)
692692
for this purpose, and if ``idle=poll`` is used, idle CPUs will execute a
693-
more or less ``lightweight'' sequence of instructions in a tight loop. [Note
693+
more or less "lightweight" sequence of instructions in a tight loop. [Note
694694
that using ``idle=poll`` is somewhat drastic in many cases, as preventing idle
695695
CPUs from saving almost any energy at all may not be the only effect of it.
696696
For example, on Intel hardware it effectively prevents CPUs from using

Documentation/admin-guide/pm/intel_pstate.rst

+5-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ Energy-Performance Bias (EPB) knob (otherwise), which means that the processor's
123123
internal P-state selection logic is expected to focus entirely on performance.
124124

125125
This will override the EPP/EPB setting coming from the ``sysfs`` interface
126-
(see `Energy vs Performance Hints`_ below).
126+
(see `Energy vs Performance Hints`_ below). Moreover, any attempts to change
127+
the EPP/EPB to a value different from 0 ("performance") via ``sysfs`` in this
128+
configuration will be rejected.
127129

128130
Also, in this configuration the range of P-states available to the processor's
129131
internal P-state selection logic is always restricted to the upper boundary
@@ -564,8 +566,8 @@ Energy-Performance Preference (EPP) knob (if supported) or its
564566
Energy-Performance Bias (EPB) knob. It is also possible to write a positive
565567
integer value between 0 to 255, if the EPP feature is present. If the EPP
566568
feature is not present, writing integer value to this attribute is not
567-
supported. In this case, user can use
568-
"/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface.
569+
supported. In this case, user can use the
570+
"/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface.
569571

570572
[Note that tasks may by migrated from one CPU to another by the scheduler's
571573
load-balancing algorithm and if different energy vs performance hints are

Documentation/bpf/ringbuf.rst

+1-4
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ in the order of reservations, but only after all previous records where
182182
already committed. It is thus possible for slow producers to temporarily hold
183183
off submitted records, that were reserved later.
184184

185-
Reservation/commit/consumer protocol is verified by litmus tests in
186-
Documentation/litmus_tests/bpf-rb/_.
187-
188185
One interesting implementation bit, that significantly simplifies (and thus
189186
speeds up as well) implementation of both producers and consumers is how data
190187
area is mapped twice contiguously back-to-back in the virtual memory. This
@@ -200,7 +197,7 @@ a self-pacing notifications of new data being availability.
200197
being available after commit only if consumer has already caught up right up to
201198
the record being committed. If not, consumer still has to catch up and thus
202199
will see new data anyways without needing an extra poll notification.
203-
Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbuf.c_) show that
200+
Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbufs.c) show that
204201
this allows to achieve a very high throughput without having to resort to
205202
tricks like "notify only every Nth sample", which are necessary with perf
206203
buffer. For extreme cases, when BPF program wants more manual control of

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
compatible:
2424
items:
2525
- const: raspberrypi,bcm2835-firmware
26-
- const: simple-bus
26+
- const: simple-mfd
2727

2828
mboxes:
2929
$ref: '/schemas/types.yaml#/definitions/phandle'
@@ -57,7 +57,7 @@ required:
5757
examples:
5858
- |
5959
firmware {
60-
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
60+
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
6161
mboxes = <&mailbox>;
6262
6363
firmware_clocks: clocks {

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ examples:
6767
6868
main_crypto: crypto@4e00000 {
6969
compatible = "ti,j721-sa2ul";
70-
reg = <0x0 0x4e00000 0x0 0x1200>;
70+
reg = <0x4e00000 0x1200>;
7171
power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
7272
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
7373
<&main_udmap 0x4001>;

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ examples:
145145
146146
display@fd4a0000 {
147147
compatible = "xlnx,zynqmp-dpsub-1.7";
148-
reg = <0x0 0xfd4a0000 0x0 0x1000>,
149-
<0x0 0xfd4aa000 0x0 0x1000>,
150-
<0x0 0xfd4ab000 0x0 0x1000>,
151-
<0x0 0xfd4ac000 0x0 0x1000>;
148+
reg = <0xfd4a0000 0x1000>,
149+
<0xfd4aa000 0x1000>,
150+
<0xfd4ab000 0x1000>,
151+
<0xfd4ac000 0x1000>;
152152
reg-names = "dp", "blend", "av_buf", "aud";
153153
interrupts = <0 119 4>;
154154
interrupt-parent = <&gic>;

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ examples:
5757
5858
dma: dma-controller@fd4c0000 {
5959
compatible = "xlnx,zynqmp-dpdma";
60-
reg = <0x0 0xfd4c0000 0x0 0x1000>;
60+
reg = <0xfd4c0000 0x1000>;
6161
interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
6262
interrupt-parent = <&gic>;
6363
clocks = <&dpdma_clk>;

Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ Required properties:
2020
- gpio-controller : Marks the device node as a GPIO controller
2121
- interrupts : Interrupt specifier, see interrupt-controller/interrupts.txt
2222
- interrupt-controller : Mark the GPIO controller as an interrupt-controller
23-
- ngpios : number of GPIO lines, see gpio.txt
24-
(should be multiple of 8, up to 80 pins)
23+
- ngpios : number of *hardware* GPIO lines, see gpio.txt. This will expose
24+
2 software GPIOs per hardware GPIO: one for hardware input, one for hardware
25+
output. Up to 80 pins, must be a multiple of 8.
2526
- clocks : A phandle to the APB clock for SGPM clock division
2627
- bus-frequency : SGPM CLK frequency
2728

Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt

-66
This file was deleted.

0 commit comments

Comments
 (0)