Skip to content

Commit ff36e78

Browse files
committed
Merge drm/drm-next into drm-intel-next-queued
Some DSI and VBT pending patches from Hans will apply cleanly and with less ugly conflicts if they are rebuilt on top of other patches that recently landed on drm-next. Reference: https://patchwork.freedesktop.org/series/70952/ Cc: Hans de Goede <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]
2 parents 143d9c3 + 1b245ec commit ff36e78

File tree

9,522 files changed

+512334
-234217
lines changed

Some content is hidden

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

9,522 files changed

+512334
-234217
lines changed

.mailmap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Aleksey Gorelov <[email protected]>
1818
Aleksandar Markovic <[email protected]> <[email protected]>
1919
2020
21+
2122
Alexei Starovoitov <[email protected]> <[email protected]>
2223
Alexei Starovoitov <[email protected]> <[email protected]>
2324
Alexei Starovoitov <[email protected]> <[email protected]>
@@ -27,6 +28,8 @@ Andi Shyti <[email protected]> <[email protected]>
2728
Andreas Herrmann <[email protected]>
2829
2930
Andrew Morton <[email protected]>
31+
32+
3033
Andrew Vasquez <[email protected]>
3134
Andy Adamson <[email protected]>
3235
Antoine Tenart <[email protected]>
@@ -74,6 +77,7 @@ Dmitry Safonov <[email protected]> <[email protected]>
7477
Domen Puncer <[email protected]>
7578
Douglas Gilbert <[email protected]>
7679
Ed L. Cashin <[email protected]>
80+
7781
Evgeniy Polyakov <[email protected]>
7882
Felipe W Damasio <[email protected]>
7983
Felix Kuhling <[email protected]>
@@ -138,6 +142,7 @@ Juha Yrjola <at solidboot.com>
138142
Juha Yrjola <[email protected]>
139143
Juha Yrjola <[email protected]>
140144
145+
141146
Kay Sievers <[email protected]>
142147
Kenneth W Chen <[email protected]>
143148
Konstantin Khlebnikov <[email protected]> <[email protected]>
@@ -209,6 +214,10 @@ Paolo 'Blaisorblade' Giarrusso <[email protected]>
209214
Patrick Mochel <[email protected]>
210215
211216
217+
218+
219+
220+
212221
Peter A Jonsson <[email protected]>
213222
Peter Oruba <[email protected]>
214223
Peter Oruba <[email protected]>
@@ -217,6 +226,7 @@ Praveen BP <[email protected]>
217226
218227
219228
229+
220230
Rajesh Shah <[email protected]>
221231
Ralf Baechle <[email protected]>
222232
Ralf Wildenhues <[email protected]>
@@ -252,6 +262,7 @@ Sumit Semwal <[email protected]>
252262
Tejun Heo <[email protected]>
253263
Thomas Graf <[email protected]>
254264
Thomas Pedersen <[email protected]>
265+
255266
256267
Tony Luck <[email protected]>
257268

CREDITS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3302,7 +3302,9 @@ S: France
33023302
N: Aleksa Sarai
33033303
33043304
W: https://www.cyphar.com/
3305-
D: `pids` cgroup subsystem
3305+
D: /sys/fs/cgroup/pids
3306+
D: openat2(2)
3307+
S: Sydney, Australia
33063308

33073309
N: Dipankar Sarma
33083310
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
What: /sys/fs/selinux/disable
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
5+
Description:
6+
7+
The selinuxfs "disable" node allows SELinux to be disabled at runtime
8+
prior to a policy being loaded into the kernel. If disabled via this
9+
mechanism, SELinux will remain disabled until the system is rebooted.
10+
11+
The preferred method of disabling SELinux is via the "selinux=0" boot
12+
parameter, but the selinuxfs "disable" node was created to make it
13+
easier for systems with primitive bootloaders that did not allow for
14+
easy modification of the kernel command line. Unfortunately, allowing
15+
for SELinux to be disabled at runtime makes it difficult to secure the
16+
kernel's LSM hooks using the "__ro_after_init" feature.
17+
18+
Thankfully, the need for the SELinux runtime disable appears to be
19+
gone, the default Kconfig configuration disables this selinuxfs node,
20+
and only one of the major distributions, Fedora, supports disabling
21+
SELinux at runtime. Fedora is in the process of removing the
22+
selinuxfs "disable" node and once that is complete we will start the
23+
slow process of removing this code from the kernel.
24+
25+
More information on /sys/fs/selinux/disable can be found under the
26+
CONFIG_SECURITY_SELINUX_DISABLE Kconfig option.

Documentation/ABI/stable/sysfs-class-tpm

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
What: /sys/class/tpm/tpmX/device/
22
Date: April 2005
33
KernelVersion: 2.6.12
4-
4+
55
Description: The device/ directory under a specific TPM instance exposes
66
the properties of that TPM chip
77

88

99
What: /sys/class/tpm/tpmX/device/active
1010
Date: April 2006
1111
KernelVersion: 2.6.17
12-
12+
1313
Description: The "active" property prints a '1' if the TPM chip is accepting
1414
commands. An inactive TPM chip still contains all the state of
1515
an active chip (Storage Root Key, NVRAM, etc), and can be
@@ -21,15 +21,15 @@ Description: The "active" property prints a '1' if the TPM chip is accepting
2121
What: /sys/class/tpm/tpmX/device/cancel
2222
Date: June 2005
2323
KernelVersion: 2.6.13
24-
24+
2525
Description: The "cancel" property allows you to cancel the currently
2626
pending TPM command. Writing any value to cancel will call the
2727
TPM vendor specific cancel operation.
2828

2929
What: /sys/class/tpm/tpmX/device/caps
3030
Date: April 2005
3131
KernelVersion: 2.6.12
32-
32+
3333
Description: The "caps" property contains TPM manufacturer and version info.
3434

3535
Example output:
@@ -46,7 +46,7 @@ Description: The "caps" property contains TPM manufacturer and version info.
4646
What: /sys/class/tpm/tpmX/device/durations
4747
Date: March 2011
4848
KernelVersion: 3.1
49-
49+
5050
Description: The "durations" property shows the 3 vendor-specific values
5151
used to wait for a short, medium and long TPM command. All
5252
TPM commands are categorized as short, medium or long in
@@ -69,7 +69,7 @@ Description: The "durations" property shows the 3 vendor-specific values
6969
What: /sys/class/tpm/tpmX/device/enabled
7070
Date: April 2006
7171
KernelVersion: 2.6.17
72-
72+
7373
Description: The "enabled" property prints a '1' if the TPM chip is enabled,
7474
meaning that it should be visible to the OS. This property
7575
may be visible but produce a '0' after some operation that
@@ -78,15 +78,15 @@ Description: The "enabled" property prints a '1' if the TPM chip is enabled,
7878
What: /sys/class/tpm/tpmX/device/owned
7979
Date: April 2006
8080
KernelVersion: 2.6.17
81-
81+
8282
Description: The "owned" property produces a '1' if the TPM_TakeOwnership
8383
ordinal has been executed successfully in the chip. A '0'
8484
indicates that ownership hasn't been taken.
8585

8686
What: /sys/class/tpm/tpmX/device/pcrs
8787
Date: April 2005
8888
KernelVersion: 2.6.12
89-
89+
9090
Description: The "pcrs" property will dump the current value of all Platform
9191
Configuration Registers in the TPM. Note that since these
9292
values may be constantly changing, the output is only valid
@@ -109,7 +109,7 @@ Description: The "pcrs" property will dump the current value of all Platform
109109
What: /sys/class/tpm/tpmX/device/pubek
110110
Date: April 2005
111111
KernelVersion: 2.6.12
112-
112+
113113
Description: The "pubek" property will return the TPM's public endorsement
114114
key if possible. If the TPM has had ownership established and
115115
is version 1.2, the pubek will not be available without the
@@ -161,7 +161,7 @@ Description: The "pubek" property will return the TPM's public endorsement
161161
What: /sys/class/tpm/tpmX/device/temp_deactivated
162162
Date: April 2006
163163
KernelVersion: 2.6.17
164-
164+
165165
Description: The "temp_deactivated" property returns a '1' if the chip has
166166
been temporarily deactivated, usually until the next power
167167
cycle. Whether a warm boot (reboot) will clear a TPM chip
@@ -170,7 +170,7 @@ Description: The "temp_deactivated" property returns a '1' if the chip has
170170
What: /sys/class/tpm/tpmX/device/timeouts
171171
Date: March 2011
172172
KernelVersion: 3.1
173-
173+
174174
Description: The "timeouts" property shows the 4 vendor-specific values
175175
for the TPM's interface spec timeouts. The use of these
176176
timeouts is defined by the TPM interface spec that the chip
@@ -183,3 +183,14 @@ Description: The "timeouts" property shows the 4 vendor-specific values
183183
The four timeout values are shown in usecs, with a trailing
184184
"[original]" or "[adjusted]" depending on whether the values
185185
were scaled by the driver to be reported in usec from msecs.
186+
187+
What: /sys/class/tpm/tpmX/tpm_version_major
188+
Date: October 2019
189+
KernelVersion: 5.5
190+
191+
Description: The "tpm_version_major" property shows the TCG spec major version
192+
implemented by the TPM device.
193+
194+
Example output:
195+
196+
2
Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
What: sys/bus/dsa/devices/dsa<m>/cdev_major
2+
Date: Oct 25, 2019
3+
KernelVersion: 5.6.0
4+
5+
Description: The major number that the character device driver assigned to
6+
this device.
7+
8+
What: sys/bus/dsa/devices/dsa<m>/errors
9+
Date: Oct 25, 2019
10+
KernelVersion: 5.6.0
11+
12+
Description: The error information for this device.
13+
14+
What: sys/bus/dsa/devices/dsa<m>/max_batch_size
15+
Date: Oct 25, 2019
16+
KernelVersion: 5.6.0
17+
18+
Description: The largest number of work descriptors in a batch.
19+
20+
What: sys/bus/dsa/devices/dsa<m>/max_work_queues_size
21+
Date: Oct 25, 2019
22+
KernelVersion: 5.6.0
23+
24+
Description: The maximum work queue size supported by this device.
25+
26+
What: sys/bus/dsa/devices/dsa<m>/max_engines
27+
Date: Oct 25, 2019
28+
KernelVersion: 5.6.0
29+
30+
Description: The maximum number of engines supported by this device.
31+
32+
What: sys/bus/dsa/devices/dsa<m>/max_groups
33+
Date: Oct 25, 2019
34+
KernelVersion: 5.6.0
35+
36+
Description: The maximum number of groups can be created under this device.
37+
38+
What: sys/bus/dsa/devices/dsa<m>/max_tokens
39+
Date: Oct 25, 2019
40+
KernelVersion: 5.6.0
41+
42+
Description: The total number of bandwidth tokens supported by this device.
43+
The bandwidth tokens represent resources within the DSA
44+
implementation, and these resources are allocated by engines to
45+
support operations.
46+
47+
What: sys/bus/dsa/devices/dsa<m>/max_transfer_size
48+
Date: Oct 25, 2019
49+
KernelVersion: 5.6.0
50+
51+
Description: The number of bytes to be read from the source address to
52+
perform the operation. The maximum transfer size is dependent on
53+
the workqueue the descriptor was submitted to.
54+
55+
What: sys/bus/dsa/devices/dsa<m>/max_work_queues
56+
Date: Oct 25, 2019
57+
KernelVersion: 5.6.0
58+
59+
Description: The maximum work queue number that this device supports.
60+
61+
What: sys/bus/dsa/devices/dsa<m>/numa_node
62+
Date: Oct 25, 2019
63+
KernelVersion: 5.6.0
64+
65+
Description: The numa node number for this device.
66+
67+
What: sys/bus/dsa/devices/dsa<m>/op_cap
68+
Date: Oct 25, 2019
69+
KernelVersion: 5.6.0
70+
71+
Description: The operation capability bit mask specify the operation types
72+
supported by the this device.
73+
74+
What: sys/bus/dsa/devices/dsa<m>/state
75+
Date: Oct 25, 2019
76+
KernelVersion: 5.6.0
77+
78+
Description: The state information of this device. It can be either enabled
79+
or disabled.
80+
81+
What: sys/bus/dsa/devices/dsa<m>/group<m>.<n>
82+
Date: Oct 25, 2019
83+
KernelVersion: 5.6.0
84+
85+
Description: The assigned group under this device.
86+
87+
What: sys/bus/dsa/devices/dsa<m>/engine<m>.<n>
88+
Date: Oct 25, 2019
89+
KernelVersion: 5.6.0
90+
91+
Description: The assigned engine under this device.
92+
93+
What: sys/bus/dsa/devices/dsa<m>/wq<m>.<n>
94+
Date: Oct 25, 2019
95+
KernelVersion: 5.6.0
96+
97+
Description: The assigned work queue under this device.
98+
99+
What: sys/bus/dsa/devices/dsa<m>/configurable
100+
Date: Oct 25, 2019
101+
KernelVersion: 5.6.0
102+
103+
Description: To indicate if this device is configurable or not.
104+
105+
What: sys/bus/dsa/devices/dsa<m>/token_limit
106+
Date: Oct 25, 2019
107+
KernelVersion: 5.6.0
108+
109+
Description: The maximum number of bandwidth tokens that may be in use at
110+
one time by operations that access low bandwidth memory in the
111+
device.
112+
113+
What: sys/bus/dsa/devices/wq<m>.<n>/group_id
114+
Date: Oct 25, 2019
115+
KernelVersion: 5.6.0
116+
117+
Description: The group id that this work queue belongs to.
118+
119+
What: sys/bus/dsa/devices/wq<m>.<n>/size
120+
Date: Oct 25, 2019
121+
KernelVersion: 5.6.0
122+
123+
Description: The work queue size for this work queue.
124+
125+
What: sys/bus/dsa/devices/wq<m>.<n>/type
126+
Date: Oct 25, 2019
127+
KernelVersion: 5.6.0
128+
129+
Description: The type of this work queue, it can be "kernel" type for work
130+
queue usages in the kernel space or "user" type for work queue
131+
usages by applications in user space.
132+
133+
What: sys/bus/dsa/devices/wq<m>.<n>/cdev_minor
134+
Date: Oct 25, 2019
135+
KernelVersion: 5.6.0
136+
137+
Description: The minor number assigned to this work queue by the character
138+
device driver.
139+
140+
What: sys/bus/dsa/devices/wq<m>.<n>/mode
141+
Date: Oct 25, 2019
142+
KernelVersion: 5.6.0
143+
144+
Description: The work queue mode type for this work queue.
145+
146+
What: sys/bus/dsa/devices/wq<m>.<n>/priority
147+
Date: Oct 25, 2019
148+
KernelVersion: 5.6.0
149+
150+
Description: The priority value of this work queue, it is a vlue relative to
151+
other work queue in the same group to control quality of service
152+
for dispatching work from multiple workqueues in the same group.
153+
154+
What: sys/bus/dsa/devices/wq<m>.<n>/state
155+
Date: Oct 25, 2019
156+
KernelVersion: 5.6.0
157+
158+
Description: The current state of the work queue.
159+
160+
What: sys/bus/dsa/devices/wq<m>.<n>/threshold
161+
Date: Oct 25, 2019
162+
KernelVersion: 5.6.0
163+
164+
Description: The number of entries in this work queue that may be filled
165+
via a limited portal.
166+
167+
What: sys/bus/dsa/devices/engine<m>.<n>/group_id
168+
Date: Oct 25, 2019
169+
KernelVersion: 5.6.0
170+
171+
Description: The group that this engine belongs to.

0 commit comments

Comments
 (0)