Skip to content

Commit 857de6f

Browse files
committed
Merge branch 'fixes-v5.11' into fixes
2 parents 9bbce32 + fbfa463 commit 857de6f

File tree

1,698 files changed

+19857
-9898
lines changed

Some content is hidden

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

1,698 files changed

+19857
-9898
lines changed

.clang-format

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ ForEachMacros:
122122
- 'drm_for_each_bridge_in_chain'
123123
- 'drm_for_each_connector_iter'
124124
- 'drm_for_each_crtc'
125+
- 'drm_for_each_crtc_reverse'
125126
- 'drm_for_each_encoder'
126127
- 'drm_for_each_encoder_mask'
127128
- 'drm_for_each_fb'
@@ -203,14 +204,13 @@ ForEachMacros:
203204
- 'for_each_matching_node'
204205
- 'for_each_matching_node_and_match'
205206
- 'for_each_member'
206-
- 'for_each_mem_region'
207-
- 'for_each_memblock_type'
208207
- 'for_each_memcg_cache_index'
209208
- 'for_each_mem_pfn_range'
210209
- '__for_each_mem_range'
211210
- 'for_each_mem_range'
212211
- '__for_each_mem_range_rev'
213212
- 'for_each_mem_range_rev'
213+
- 'for_each_mem_region'
214214
- 'for_each_migratetype_order'
215215
- 'for_each_msi_entry'
216216
- 'for_each_msi_entry_safe'
@@ -276,10 +276,8 @@ ForEachMacros:
276276
- 'for_each_reserved_mem_range'
277277
- 'for_each_reserved_mem_region'
278278
- 'for_each_rtd_codec_dais'
279-
- 'for_each_rtd_codec_dais_rollback'
280279
- 'for_each_rtd_components'
281280
- 'for_each_rtd_cpu_dais'
282-
- 'for_each_rtd_cpu_dais_rollback'
283281
- 'for_each_rtd_dais'
284282
- 'for_each_set_bit'
285283
- 'for_each_set_bit_from'
@@ -298,6 +296,7 @@ ForEachMacros:
298296
- '__for_each_thread'
299297
- 'for_each_thread'
300298
- 'for_each_unicast_dest_pgid'
299+
- 'for_each_vsi'
301300
- 'for_each_wakeup_source'
302301
- 'for_each_zone'
303302
- 'for_each_zone_zonelist'
@@ -330,6 +329,7 @@ ForEachMacros:
330329
- 'hlist_for_each_entry_rcu_bh'
331330
- 'hlist_for_each_entry_rcu_notrace'
332331
- 'hlist_for_each_entry_safe'
332+
- 'hlist_for_each_entry_srcu'
333333
- '__hlist_for_each_rcu'
334334
- 'hlist_for_each_safe'
335335
- 'hlist_nulls_for_each_entry'
@@ -378,6 +378,7 @@ ForEachMacros:
378378
- 'list_for_each_entry_safe_continue'
379379
- 'list_for_each_entry_safe_from'
380380
- 'list_for_each_entry_safe_reverse'
381+
- 'list_for_each_entry_srcu'
381382
- 'list_for_each_prev'
382383
- 'list_for_each_prev_safe'
383384
- 'list_for_each_safe'
@@ -411,6 +412,8 @@ ForEachMacros:
411412
- 'of_property_for_each_string'
412413
- 'of_property_for_each_u32'
413414
- 'pci_bus_for_each_resource'
415+
- 'pcl_for_each_chunk'
416+
- 'pcl_for_each_segment'
414417
- 'pcm_for_each_format'
415418
- 'ping_portaddr_for_each_entry'
416419
- 'plist_for_each'

.mailmap

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
#
1010
# Please keep this list dictionary sorted.
1111
#
12-
# This comment is parsed by git-shortlog:
13-
# repo-abbrev: /pub/scm/linux/kernel/git/
14-
#
1512
Aaron Durbin <[email protected]>
1613
Adam Oldham <[email protected]>
1714
Adam Radford <[email protected]>
@@ -40,6 +37,7 @@ Andrew Murray <[email protected]> <[email protected]>
4037
4138
Andrew Vasquez <[email protected]>
4239
40+
4341
Andy Adamson <[email protected]>
4442
4543
@@ -55,6 +53,8 @@ Bart Van Assche <[email protected]> <[email protected]>
5553
Ben Gardner <[email protected]>
5654
Ben M Cahill <[email protected]>
5755
Björn Steinbrink <[email protected]>
56+
57+
5858
5959
6060
@@ -180,6 +180,8 @@ Kees Cook <[email protected]> <[email protected]>
180180
181181
182182
183+
184+
183185
Kenneth W Chen <[email protected]>
184186
Konstantin Khlebnikov <[email protected]> <[email protected]>
185187
Konstantin Khlebnikov <[email protected]> <[email protected]>
@@ -200,6 +202,8 @@ Li Yang <[email protected]> <[email protected]>
200202
201203
202204
205+
Manivannan Sadhasivam <[email protected]> <[email protected]>
206+
Manivannan Sadhasivam <[email protected]> <[email protected]>
203207
204208
205209
Mark Brown <[email protected]>
@@ -245,6 +249,7 @@ Morten Welinder <[email protected]>
245249
Morten Welinder <[email protected]>
246250
Morten Welinder <[email protected]>
247251
Mythri P K <[email protected]>
252+
248253
Nguyen Anh Quynh <[email protected]>
249254
250255
@@ -335,6 +340,8 @@ Vinod Koul <[email protected]> <[email protected]>
335340
336341
337342
343+
344+
338345
339346
340347

CREDITS

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes
710710
S: Las Heras, Mendoza CP 5539
711711
S: Argentina
712712

713+
N: Jay Cliburn
714+
715+
D: ATLX Ethernet drivers
716+
713717
N: Steven P. Cole
714718
715719
@@ -1284,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle
12841288
D: ISDN Maintainer
12851289
S: USA
12861290

1291+
N: Gerrit Renker
1292+
1293+
D: DCCP protocol support.
1294+
12871295
N: Philip Gladstone
12881296
12891297
D: Kernel / timekeeping stuff
@@ -2138,6 +2146,10 @@ E: [email protected]
21382146
21392147
D: Original author of software suspend
21402148

2149+
N: Alexey Kuznetsov
2150+
2151+
D: Author and maintainer of large parts of the networking stack
2152+
21412153
N: Jaroslav Kysela
21422154
21432155
W: https://www.perex.cz
@@ -2696,6 +2708,10 @@ N: Wolfgang Muees
26962708
26972709
D: Auerswald USB driver
26982710

2711+
N: Shrijeet Mukherjee
2712+
2713+
D: Network routing domains (VRF).
2714+
26992715
N: Paul Mundt
27002716
27012717
D: SuperH maintainer
@@ -4110,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu
41104126
S: 16 Baliqiao Nanjie, Beijing 101100
41114127
S: People's Repulic of China
41124128

4129+
N: Aviad Yehezkel
4130+
4131+
D: Kernel TLS implementation and offload support.
4132+
41134133
N: Victor Yodaiken
41144134
41154135
D: RTLinux (RealTime Linux)
@@ -4167,6 +4187,10 @@ S: 1507 145th Place SE #B5
41674187
S: Bellevue, Washington 98007
41684188
S: USA
41694189

4190+
N: Wensong Zhang
4191+
4192+
D: IP virtual server (IPVS).
4193+
41704194
N: Haojian Zhuang
41714195
41724196
D: MMP support

Documentation/ABI/testing/sysfs-class-devlink

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Description:
55
Provide a place in sysfs for the device link objects in the
66
kernel at any given time. The name of a device link directory,
77
denoted as ... above, is of the form <supplier>--<consumer>
8-
where <supplier> is the supplier device name and <consumer> is
9-
the consumer device name.
8+
where <supplier> is the supplier bus:device name and <consumer>
9+
is the consumer bus:device name.
1010

1111
What: /sys/class/devlink/.../auto_remove_on
1212
Date: May 2020

Documentation/ABI/testing/sysfs-devices-consumer

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <[email protected]>
44
Description:
55
The /sys/devices/.../consumer:<consumer> are symlinks to device
66
links where this device is the supplier. <consumer> denotes the
7-
name of the consumer in that device link. There can be zero or
8-
more of these symlinks for a given device.
7+
name of the consumer in that device link and is of the form
8+
bus:device name. There can be zero or more of these symlinks
9+
for a given device.

Documentation/ABI/testing/sysfs-devices-supplier

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <[email protected]>
44
Description:
55
The /sys/devices/.../supplier:<supplier> are symlinks to device
66
links where this device is the consumer. <supplier> denotes the
7-
name of the supplier in that device link. There can be zero or
8-
more of these symlinks for a given device.
7+
name of the supplier in that device link and is of the form
8+
bus:device name. There can be zero or more of these symlinks
9+
for a given device.

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -916,21 +916,25 @@ Date: September 2014
916916
Contact: Subhash Jadavani <[email protected]>
917917
Description: This entry could be used to set or show the UFS device
918918
runtime power management level. The current driver
919-
implementation supports 6 levels with next target states:
919+
implementation supports 7 levels with next target states:
920920

921921
== ====================================================
922-
0 an UFS device will stay active, an UIC link will
922+
0 UFS device will stay active, UIC link will
923923
stay active
924-
1 an UFS device will stay active, an UIC link will
924+
1 UFS device will stay active, UIC link will
925925
hibernate
926-
2 an UFS device will moved to sleep, an UIC link will
926+
2 UFS device will be moved to sleep, UIC link will
927927
stay active
928-
3 an UFS device will moved to sleep, an UIC link will
928+
3 UFS device will be moved to sleep, UIC link will
929929
hibernate
930-
4 an UFS device will be powered off, an UIC link will
930+
4 UFS device will be powered off, UIC link will
931931
hibernate
932-
5 an UFS device will be powered off, an UIC link will
932+
5 UFS device will be powered off, UIC link will
933933
be powered off
934+
6 UFS device will be moved to deep sleep, UIC link
935+
will be powered off. Note, deep sleep might not be
936+
supported in which case this value will not be
937+
accepted
934938
== ====================================================
935939

936940
What: /sys/bus/platform/drivers/ufshcd/*/rpm_target_dev_state
@@ -954,21 +958,25 @@ Date: September 2014
954958
Contact: Subhash Jadavani <[email protected]>
955959
Description: This entry could be used to set or show the UFS device
956960
system power management level. The current driver
957-
implementation supports 6 levels with next target states:
961+
implementation supports 7 levels with next target states:
958962

959963
== ====================================================
960-
0 an UFS device will stay active, an UIC link will
964+
0 UFS device will stay active, UIC link will
961965
stay active
962-
1 an UFS device will stay active, an UIC link will
966+
1 UFS device will stay active, UIC link will
963967
hibernate
964-
2 an UFS device will moved to sleep, an UIC link will
968+
2 UFS device will be moved to sleep, UIC link will
965969
stay active
966-
3 an UFS device will moved to sleep, an UIC link will
970+
3 UFS device will be moved to sleep, UIC link will
967971
hibernate
968-
4 an UFS device will be powered off, an UIC link will
972+
4 UFS device will be powered off, UIC link will
969973
hibernate
970-
5 an UFS device will be powered off, an UIC link will
974+
5 UFS device will be powered off, UIC link will
971975
be powered off
976+
6 UFS device will be moved to deep sleep, UIC link
977+
will be powered off. Note, deep sleep might not be
978+
supported in which case this value will not be
979+
accepted
972980
== ====================================================
973981

974982
What: /sys/bus/platform/drivers/ufshcd/*/spm_target_dev_state

Documentation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
7575
cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media $2 && \
7676
PYTHONDONTWRITEBYTECODE=1 \
7777
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
78-
$(PYTHON) $(srctree)/scripts/jobserver-exec \
78+
$(PYTHON3) $(srctree)/scripts/jobserver-exec \
7979
$(SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
8080
$(SPHINXBUILD) \
8181
-b $2 \

Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ read-side critical sections that follow the idle period (the oval near
473473
the bottom of the diagram above).
474474

475475
Plumbing this into the full grace-period execution is described
476-
`below <#Forcing%20Quiescent%20States>`__.
476+
`below <Forcing Quiescent States_>`__.
477477

478478
CPU-Hotplug Interface
479479
^^^^^^^^^^^^^^^^^^^^^
@@ -494,7 +494,7 @@ mask to detect CPUs having gone offline since the beginning of this
494494
grace period.
495495

496496
Plumbing this into the full grace-period execution is described
497-
`below <#Forcing%20Quiescent%20States>`__.
497+
`below <Forcing Quiescent States_>`__.
498498

499499
Forcing Quiescent States
500500
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -532,7 +532,7 @@ from other CPUs.
532532
| RCU. But this diagram is complex enough as it is, so simplicity |
533533
| overrode accuracy. You can think of it as poetic license, or you can |
534534
| think of it as misdirection that is resolved in the |
535-
| `stitched-together diagram <#Putting%20It%20All%20Together>`__. |
535+
| `stitched-together diagram <Putting It All Together_>`__. |
536536
+-----------------------------------------------------------------------+
537537

538538
Grace-Period Cleanup
@@ -596,7 +596,7 @@ maintain ordering. For example, if the callback function wakes up a task
596596
that runs on some other CPU, proper ordering must in place in both the
597597
callback function and the task being awakened. To see why this is
598598
important, consider the top half of the `grace-period
599-
cleanup <#Grace-Period%20Cleanup>`__ diagram. The callback might be
599+
cleanup`_ diagram. The callback might be
600600
running on a CPU corresponding to the leftmost leaf ``rcu_node``
601601
structure, and awaken a task that is to run on a CPU corresponding to
602602
the rightmost leaf ``rcu_node`` structure, and the grace-period kernel

0 commit comments

Comments
 (0)