Skip to content

Commit 8dd06ef

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.8 merge window.
2 parents 642aa86 + d0ac707 commit 8dd06ef

File tree

11,848 files changed

+607005
-287565
lines changed

Some content is hidden

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

11,848 files changed

+607005
-287565
lines changed

.clang-format

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ ForEachMacros:
8686
- 'bio_for_each_segment_all'
8787
- 'bio_list_for_each'
8888
- 'bip_for_each_vec'
89+
- 'bitmap_for_each_clear_region'
90+
- 'bitmap_for_each_set_region'
8991
- 'blkg_for_each_descendant_post'
9092
- 'blkg_for_each_descendant_pre'
9193
- 'blk_queue_for_each_rl'
@@ -115,6 +117,7 @@ ForEachMacros:
115117
- 'drm_client_for_each_connector_iter'
116118
- 'drm_client_for_each_modeset'
117119
- 'drm_connector_for_each_possible_encoder'
120+
- 'drm_for_each_bridge_in_chain'
118121
- 'drm_for_each_connector_iter'
119122
- 'drm_for_each_crtc'
120123
- 'drm_for_each_encoder'
@@ -136,9 +139,10 @@ ForEachMacros:
136139
- 'for_each_bio'
137140
- 'for_each_board_func_rsrc'
138141
- 'for_each_bvec'
142+
- 'for_each_card_auxs'
143+
- 'for_each_card_auxs_safe'
139144
- 'for_each_card_components'
140-
- 'for_each_card_links'
141-
- 'for_each_card_links_safe'
145+
- 'for_each_card_pre_auxs'
142146
- 'for_each_card_prelinks'
143147
- 'for_each_card_rtds'
144148
- 'for_each_card_rtds_safe'
@@ -166,6 +170,7 @@ ForEachMacros:
166170
- 'for_each_dpcm_fe'
167171
- 'for_each_drhd_unit'
168172
- 'for_each_dss_dev'
173+
- 'for_each_efi_handle'
169174
- 'for_each_efi_memory_desc'
170175
- 'for_each_efi_memory_desc_in_map'
171176
- 'for_each_element'
@@ -190,6 +195,7 @@ ForEachMacros:
190195
- 'for_each_lru'
191196
- 'for_each_matching_node'
192197
- 'for_each_matching_node_and_match'
198+
- 'for_each_member'
193199
- 'for_each_memblock'
194200
- 'for_each_memblock_type'
195201
- 'for_each_memcg_cache_index'
@@ -200,9 +206,11 @@ ForEachMacros:
200206
- 'for_each_msi_entry'
201207
- 'for_each_msi_entry_safe'
202208
- 'for_each_net'
209+
- 'for_each_net_continue_reverse'
203210
- 'for_each_netdev'
204211
- 'for_each_netdev_continue'
205212
- 'for_each_netdev_continue_rcu'
213+
- 'for_each_netdev_continue_reverse'
206214
- 'for_each_netdev_feature'
207215
- 'for_each_netdev_in_bond_rcu'
208216
- 'for_each_netdev_rcu'
@@ -254,10 +262,10 @@ ForEachMacros:
254262
- 'for_each_reserved_mem_region'
255263
- 'for_each_rtd_codec_dai'
256264
- 'for_each_rtd_codec_dai_rollback'
257-
- 'for_each_rtdcom'
258-
- 'for_each_rtdcom_safe'
265+
- 'for_each_rtd_components'
259266
- 'for_each_set_bit'
260267
- 'for_each_set_bit_from'
268+
- 'for_each_set_clump8'
261269
- 'for_each_sg'
262270
- 'for_each_sg_dma_page'
263271
- 'for_each_sg_page'
@@ -267,6 +275,7 @@ ForEachMacros:
267275
- 'for_each_subelement_id'
268276
- '__for_each_thread'
269277
- 'for_each_thread'
278+
- 'for_each_wakeup_source'
270279
- 'for_each_zone'
271280
- 'for_each_zone_zonelist'
272281
- 'for_each_zone_zonelist_nodemask'
@@ -330,6 +339,7 @@ ForEachMacros:
330339
- 'list_for_each'
331340
- 'list_for_each_codec'
332341
- 'list_for_each_codec_safe'
342+
- 'list_for_each_continue'
333343
- 'list_for_each_entry'
334344
- 'list_for_each_entry_continue'
335345
- 'list_for_each_entry_continue_rcu'
@@ -351,6 +361,7 @@ ForEachMacros:
351361
- 'llist_for_each_entry'
352362
- 'llist_for_each_entry_safe'
353363
- 'llist_for_each_safe'
364+
- 'mci_for_each_dimm'
354365
- 'media_device_for_each_entity'
355366
- 'media_device_for_each_intf'
356367
- 'media_device_for_each_link'
@@ -444,10 +455,16 @@ ForEachMacros:
444455
- 'virtio_device_for_each_vq'
445456
- 'xa_for_each'
446457
- 'xa_for_each_marked'
458+
- 'xa_for_each_range'
447459
- 'xa_for_each_start'
448460
- 'xas_for_each'
449461
- 'xas_for_each_conflict'
450462
- 'xas_for_each_marked'
463+
- 'xbc_array_for_each_value'
464+
- 'xbc_for_each_key_value'
465+
- 'xbc_node_for_each_array_value'
466+
- 'xbc_node_for_each_child'
467+
- 'xbc_node_for_each_key_value'
451468
- 'zorro_for_each_dev'
452469

453470
#IncludeBlocks: Preserve # Unknown to clang-format-5.0

.mailmap

Lines changed: 13 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]>
@@ -99,6 +103,7 @@ Jacob Shin <[email protected]>
99103
100104
101105
106+
102107
James Bottomley <jejb@mulgrave.(none)>
103108
James Bottomley <[email protected]>
104109
James E Wilson <[email protected]>
@@ -137,6 +142,7 @@ Juha Yrjola <at solidboot.com>
137142
Juha Yrjola <[email protected]>
138143
Juha Yrjola <[email protected]>
139144
145+
140146
Kay Sievers <[email protected]>
141147
Kenneth W Chen <[email protected]>
142148
Konstantin Khlebnikov <[email protected]> <[email protected]>
@@ -208,14 +214,20 @@ Paolo 'Blaisorblade' Giarrusso <[email protected]>
208214
Patrick Mochel <[email protected]>
209215
210216
217+
218+
219+
220+
211221
Peter A Jonsson <[email protected]>
212222
Peter Oruba <[email protected]>
213223
Peter Oruba <[email protected]>
214224
215225
Praveen BP <[email protected]>
216226
217227
228+
218229
230+
219231
Rajesh Shah <[email protected]>
220232
Ralf Baechle <[email protected]>
221233
Ralf Wildenhues <[email protected]>
@@ -251,6 +263,7 @@ Sumit Semwal <[email protected]>
251263
Tejun Heo <[email protected]>
252264
Thomas Graf <[email protected]>
253265
Thomas Pedersen <[email protected]>
266+
254267
255268
Tony Luck <[email protected]>
256269

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.

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

0 commit comments

Comments
 (0)