Skip to content

Commit c9f2897

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.7/appleir' into for-linus
- small code cleanups in hid-appleir from Lucas Tanure
2 parents 0aac6f9 + 910a7e8 commit c9f2897

File tree

10,776 files changed

+578011
-273982
lines changed

Some content is hidden

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

10,776 files changed

+578011
-273982
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ modules.order
100100
/include/ksym/
101101
/arch/*/include/generated/
102102

103+
# Generated lkdtm tests
104+
/tools/testing/selftests/lkdtm/*.sh
105+
!/tools/testing/selftests/lkdtm/run.sh
106+
103107
# stgit generated dirs
104108
patches-*
105109

.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

COPYING

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see:
1616
Documentation/process/license-rules.rst
1717

1818
for more details.
19+
20+
All contributions to the Linux Kernel are subject to this COPYING file.

CREDITS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem
567567
S: Orlando, Florida
568568
S: USA
569569

570+
N: Paul Burton
571+
572+
W: https://pburton.com
573+
D: MIPS maintainer 2018-2020
574+
570575
N: Lennert Buytenhek
571576
572577
D: Original (2.4) rewrite of the ethernet bridging code
@@ -3302,7 +3307,9 @@ S: France
33023307
N: Aleksa Sarai
33033308
33043309
W: https://www.cyphar.com/
3305-
D: `pids` cgroup subsystem
3310+
D: /sys/fs/cgroup/pids
3311+
D: openat2(2)
3312+
S: Sydney, Australia
33063313

33073314
N: Dipankar Sarma
33083315
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.
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.

Documentation/ABI/testing/configfs-usb-gadget

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ Description:
1616
write UDC's name found in /sys/class/udc/*
1717
to bind a gadget, empty string "" to unbind.
1818

19+
max_speed - maximum speed the driver supports. Valid
20+
names are super-speed-plus, super-speed,
21+
high-speed, full-speed, and low-speed.
22+
1923
bDeviceClass - USB device class code
2024
bDeviceSubClass - USB device subclass code
2125
bDeviceProtocol - USB device protocol code

Documentation/ABI/testing/ima_policy

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ Description:
2525
lsm: [[subj_user=] [subj_role=] [subj_type=]
2626
[obj_user=] [obj_role=] [obj_type=]]
2727
option: [[appraise_type=]] [template=] [permit_directio]
28-
[appraise_flag=]
28+
[appraise_flag=] [keyrings=]
2929
base: func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]
3030
[FIRMWARE_CHECK]
3131
[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
32-
[KEXEC_CMDLINE]
32+
[KEXEC_CMDLINE] [KEY_CHECK]
3333
mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
3434
[[^]MAY_EXEC]
3535
fsmagic:= hex value
@@ -42,6 +42,9 @@ Description:
4242
appraise_flag:= [check_blacklist]
4343
Currently, blacklist check is only for files signed with appended
4444
signature.
45+
keyrings:= list of keyrings
46+
(eg, .builtin_trusted_keys|.ima). Only valid
47+
when action is "measure" and func is KEY_CHECK.
4548
template:= name of a defined IMA template type
4649
(eg, ima-ng). Only valid when action is "measure".
4750
pcr:= decimal value
@@ -113,3 +116,12 @@ Description:
113116
Example of appraise rule allowing modsig appended signatures:
114117

115118
appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig|modsig
119+
120+
Example of measure rule using KEY_CHECK to measure all keys:
121+
122+
measure func=KEY_CHECK
123+
124+
Example of measure rule using KEY_CHECK to only measure
125+
keys added to .builtin_trusted_keys or .ima keyring:
126+
127+
measure func=KEY_CHECK keyrings=.builtin_trusted_keys|.ima

Documentation/ABI/testing/rtc-cdev

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ Description:
3333
Requires a separate RTC_PIE_ON call to enable the periodic
3434
interrupts.
3535

36+
* RTC_VL_READ: Read the voltage inputs status of the RTC when
37+
supported. The value is a bit field of RTC_VL_*, giving the
38+
status of the main and backup voltages.
39+
40+
* RTC_VL_CLEAR: Clear the voltage status of the RTC. Some RTCs
41+
need user interaction when the backup power provider is
42+
replaced or charged to be able to clear the status.
43+
3644
The ioctl() calls supported by the older /dev/rtc interface are
3745
also supported by the newer RTC class framework. However,
3846
because the chips and systems are not standardized, some PC/AT

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,3 +1726,16 @@ Contact: [email protected]
17261726
Description:
17271727
List of valid periods (in seconds) for which the light intensity
17281728
must be above the threshold level before interrupt is asserted.
1729+
1730+
What: /sys/bus/iio/devices/iio:deviceX/in_filter_notch_center_frequency
1731+
KernelVersion: 5.5
1732+
1733+
Description:
1734+
Center frequency in Hz for a notch filter. Used i.e. for line
1735+
noise suppression.
1736+
1737+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_thermocouple_type
1738+
KernelVersion: 5.5
1739+
1740+
Description:
1741+
One of the following thermocouple types: B, E, J, K, N, R, S, T.

0 commit comments

Comments
 (0)