Skip to content

Commit 9e82380

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.9 merge window.
2 parents a50ca29 + d862a30 commit 9e82380

11,563 files changed

Lines changed: 548135 additions & 275440 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.

.clang-format

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,13 @@ ForEachMacros:
142142
- 'for_each_card_auxs'
143143
- 'for_each_card_auxs_safe'
144144
- 'for_each_card_components'
145+
- 'for_each_card_dapms'
145146
- 'for_each_card_pre_auxs'
146147
- 'for_each_card_prelinks'
147148
- 'for_each_card_rtds'
148149
- 'for_each_card_rtds_safe'
150+
- 'for_each_card_widgets'
151+
- 'for_each_card_widgets_safe'
149152
- 'for_each_cgroup_storage_type'
150153
- 'for_each_child_of_node'
151154
- 'for_each_clear_bit'
@@ -160,6 +163,7 @@ ForEachMacros:
160163
- 'for_each_cpu_and'
161164
- 'for_each_cpu_not'
162165
- 'for_each_cpu_wrap'
166+
- 'for_each_dapm_widgets'
163167
- 'for_each_dev_addr'
164168
- 'for_each_dev_scope'
165169
- 'for_each_displayid_db'
@@ -170,7 +174,6 @@ ForEachMacros:
170174
- 'for_each_dpcm_fe'
171175
- 'for_each_drhd_unit'
172176
- 'for_each_dss_dev'
173-
- 'for_each_efi_handle'
174177
- 'for_each_efi_memory_desc'
175178
- 'for_each_efi_memory_desc_in_map'
176179
- 'for_each_element'
@@ -191,6 +194,7 @@ ForEachMacros:
191194
- 'for_each_ip_tunnel_rcu'
192195
- 'for_each_irq_nr'
193196
- 'for_each_link_codecs'
197+
- 'for_each_link_cpus'
194198
- 'for_each_link_platforms'
195199
- 'for_each_lru'
196200
- 'for_each_matching_node'
@@ -250,6 +254,7 @@ ForEachMacros:
250254
- 'for_each_pci_bridge'
251255
- 'for_each_pci_dev'
252256
- 'for_each_pci_msi_entry'
257+
- 'for_each_pcm_streams'
253258
- 'for_each_populated_zone'
254259
- 'for_each_possible_cpu'
255260
- 'for_each_present_cpu'
@@ -260,9 +265,12 @@ ForEachMacros:
260265
- 'for_each_property_of_node'
261266
- 'for_each_registered_fb'
262267
- 'for_each_reserved_mem_region'
263-
- 'for_each_rtd_codec_dai'
264-
- 'for_each_rtd_codec_dai_rollback'
268+
- 'for_each_rtd_codec_dais'
269+
- 'for_each_rtd_codec_dais_rollback'
265270
- 'for_each_rtd_components'
271+
- 'for_each_rtd_cpu_dais'
272+
- 'for_each_rtd_cpu_dais_rollback'
273+
- 'for_each_rtd_dais'
266274
- 'for_each_set_bit'
267275
- 'for_each_set_bit_from'
268276
- 'for_each_set_clump8'
@@ -334,6 +342,7 @@ ForEachMacros:
334342
- 'klp_for_each_object'
335343
- 'klp_for_each_object_safe'
336344
- 'klp_for_each_object_static'
345+
- 'kunit_suite_for_each_test_case'
337346
- 'kvm_for_each_memslot'
338347
- 'kvm_for_each_vcpu'
339348
- 'list_for_each'
@@ -387,6 +396,7 @@ ForEachMacros:
387396
- 'of_property_for_each_string'
388397
- 'of_property_for_each_u32'
389398
- 'pci_bus_for_each_resource'
399+
- 'pcm_for_each_format'
390400
- 'ping_portaddr_for_each_entry'
391401
- 'plist_for_each'
392402
- 'plist_for_each_continue'
@@ -482,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
482492
MacroBlockBegin: ''
483493
MacroBlockEnd: ''
484494
MaxEmptyLinesToKeep: 1
485-
NamespaceIndentation: Inner
495+
NamespaceIndentation: None
486496
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
487497
ObjCBlockIndentWidth: 8
488498
ObjCSpaceAfterProperty: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
#
23
# NOTE! Don't add files that are generated in specific
34
# subdirectories here. Add them in the ".gitignore" file

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
210210
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
211211
Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
212212
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
213+
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
213214
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
214215
Patrick Mochel <mochel@digitalimplant.org>
215216
Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
@@ -244,9 +245,11 @@ Santosh Shilimkar <ssantosh@kernel.org>
244245
Santosh Shilimkar <santosh.shilimkar@oracle.org>
245246
Sascha Hauer <s.hauer@pengutronix.de>
246247
S.Çağlar Onur <caglar@pardus.org.tr>
248+
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
247249
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
248250
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
249251
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
252+
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
250253
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
251254
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
252255
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
@@ -285,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
285288
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
286289
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
287290
Will Deacon <will@kernel.org> <will.deacon@arm.com>
291+
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
292+
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
288293
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
289294
Yusuke Goda <goda.yusuke@renesas.com>
290295
Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
output
23
*.pyc
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/enabled.
2+
3+
What: /sys/kernel/fadump_enabled
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: read only
7+
Primarily used to identify whether the FADump is enabled in
8+
the kernel or not.
9+
User: Kdump service
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
2+
3+
What: /sys/kernel/fadump_registered
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: read/write
7+
Helps to control the dump collect feature from userspace.
8+
Setting 1 to this file enables the system to collect the
9+
dump and 0 to disable it.
10+
User: Kdump service
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
2+
3+
What: /sys/kernel/fadump_release_mem
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: write only
7+
This is a special sysfs file and only available when
8+
the system is booted to capture the vmcore using FADump.
9+
It is used to release the memory reserved by FADump to
10+
save the crash dump.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
What: /sys/fs/selinux/checkreqprot
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
Contact: selinux@vger.kernel.org
5+
Description:
6+
7+
The selinuxfs "checkreqprot" node allows SELinux to be configured
8+
to check the protection requested by userspace for mmap/mprotect
9+
calls instead of the actual protection applied by the kernel.
10+
This was a compatibility mechanism for legacy userspace and
11+
for the READ_IMPLIES_EXEC personality flag. However, if set to
12+
1, it weakens security by allowing mappings to be made executable
13+
without authorization by policy. The default value of checkreqprot
14+
at boot was changed starting in Linux v4.4 to 0 (i.e. check the
15+
actual protection), and Android and Linux distributions have been
16+
explicitly writing a "0" to /sys/fs/selinux/checkreqprot during
17+
initialization for some time. Support for setting checkreqprot to 1
18+
will be removed in a future kernel release, at which point the kernel
19+
will always cease using checkreqprot internally and will always
20+
check the actual protections being applied upon mmap/mprotect calls.
21+
The checkreqprot selinuxfs node will remain for backward compatibility
22+
but will discard writes of the "0" value and will reject writes of the
23+
"1" value when this mechanism is removed.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This ABI is moved to /sys/firmware/opal/mpipl/release_core.
2+
3+
What: /sys/kernel/fadump_release_opalcore
4+
Date: Sep 2019
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: write only
7+
The sysfs file is available when the system is booted to
8+
collect the dump on OPAL based machine. It used to release
9+
the memory used to collect the opalcore.

Documentation/ABI/testing/sysfs-kernel-uids renamed to Documentation/ABI/removed/sysfs-kernel-uids

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
What: /sys/kernel/uids/<uid>/cpu_shares
2-
Date: December 2007
2+
Date: December 2007, finally removed in kernel v2.6.34-rc1
33
Contact: Dhaval Giani <dhaval@linux.vnet.ibm.com>
44
Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
55
Description:

0 commit comments

Comments
 (0)