Skip to content

Commit d631007

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.12/google' into for-linus
- User experience improvements for hid-google from Nicolas Boichat
2 parents f8dd50e + df7b622 commit d631007

4,063 files changed

Lines changed: 138419 additions & 48616 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 2 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 <adurbin@google.com>
1613
Adam Oldham <oldhamca@gmail.com>
1714
Adam Radford <aradford@gmail.com>
@@ -55,6 +52,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
5552
Ben Gardner <bgardner@wabtec.com>
5653
Ben M Cahill <ben.m.cahill@intel.com>
5754
Björn Steinbrink <B.Steinbrink@gmx.de>
55+
Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
56+
Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
5857
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
5958
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
6059
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

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+
E: jcliburn@gmail.com
715+
D: ATLX Ethernet drivers
716+
713717
N: Steven P. Cole
714718
E: scole@lanl.gov
715719
E: elenstev@mesatop.com
@@ -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+
E: gerrit@erg.abdn.ac.uk
1293+
D: DCCP protocol support.
1294+
12871295
N: Philip Gladstone
12881296
E: philip@gladstonefamily.net
12891297
D: Kernel / timekeeping stuff
@@ -2138,6 +2146,10 @@ E: seasons@falcon.sch.bme.hu
21382146
E: seasons@makosteszta.sote.hu
21392147
D: Original author of software suspend
21402148

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

2711+
N: Shrijeet Mukherjee
2712+
E: shrijeet@gmail.com
2713+
D: Network routing domains (VRF).
2714+
26992715
N: Paul Mundt
27002716
E: paul.mundt@gmail.com
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+
E: aviadye@nvidia.com
4131+
D: Kernel TLS implementation and offload support.
4132+
41134133
N: Victor Yodaiken
41144134
E: yodaiken@fsmlabs.com
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+
E: wensong@linux-vs.org
4192+
D: IP virtual server (IPVS).
4193+
41704194
N: Haojian Zhuang
41714195
E: haojian.zhuang@gmail.com
41724196
D: MMP support

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@ Contact: dmaengine@vger.kernel.org
7777
Description: The operation capability bit mask specify the operation types
7878
supported by the this device.
7979

80+
What: /sys/bus/dsa/devices/dsa<m>/pasid_enabled
81+
Date: Oct 27, 2020
82+
KernelVersion: 5.11.0
83+
Contact: dmaengine@vger.kernel.org
84+
Description: To indicate if PASID (process address space identifier) is
85+
enabled or not for this device.
86+
8087
What: /sys/bus/dsa/devices/dsa<m>/state
8188
Date: Oct 25, 2019
8289
KernelVersion: 5.6.0
@@ -122,6 +129,13 @@ KernelVersion: 5.10.0
122129
Contact: dmaengine@vger.kernel.org
123130
Description: The last executed device administrative command's status/error.
124131

132+
What: /sys/bus/dsa/devices/wq<m>.<n>/block_on_fault
133+
Date: Oct 27, 2020
134+
KernelVersion: 5.11.0
135+
Contact: dmaengine@vger.kernel.org
136+
Description: To indicate block on fault is allowed or not for the work queue
137+
to support on demand paging.
138+
125139
What: /sys/bus/dsa/devices/wq<m>.<n>/group_id
126140
Date: Oct 25, 2019
127141
KernelVersion: 5.6.0
@@ -190,6 +204,13 @@ Contact: dmaengine@vger.kernel.org
190204
Description: The max batch size for this workqueue. Cannot exceed device
191205
max batch size. Configurable parameter.
192206

207+
What: /sys/bus/dsa/devices/wq<m>.<n>/ats_disable
208+
Date: Nov 13, 2020
209+
KernelVersion: 5.11.0
210+
Contact: dmaengine@vger.kernel.org
211+
Description: Indicate whether ATS disable is turned on for the workqueue.
212+
0 indicates ATS is on, and 1 indicates ATS is off for the workqueue.
213+
193214
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
194215
Date: Oct 25, 2019
195216
KernelVersion: 5.6.0

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 <saravanak@google.com>
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 <saravanak@google.com>
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-devices-system-cpu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ Description: Discover CPUs in the same CPU frequency coordination domain
264264
attribute is useful for user space DVFS controllers to get better
265265
power/performance results for platforms using acpi-cpufreq.
266266

267-
This file is only present if the acpi-cpufreq driver is in use.
267+
This file is only present if the acpi-cpufreq or the cppc-cpufreq
268+
drivers are in use.
268269

269270

270271
What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}

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 <subhashj@codeaurora.org>
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 <subhashj@codeaurora.org>
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/ABI/testing/sysfs-fs-f2fs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,3 +370,10 @@ Date: April 2020
370370
Contact: "Daeho Jeong" <daehojeong@google.com>
371371
Description: Give a way to change iostat_period time. 3secs by default.
372372
The new iostat trace gives stats gap given the period.
373+
What: /sys/fs/f2fs/<disk>/max_io_bytes
374+
Date: December 2020
375+
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
376+
Description: This gives a control to limit the bio size in f2fs.
377+
Default is zero, which will follow underlying block layer limit,
378+
whereas, if it has a certain bytes value, f2fs won't submit a
379+
bio larger than that size.

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)