Skip to content

Commit 16ba7e3

Browse files
author
Jiri Kosina
committed
Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus
8 parents e72455b + 346338e + c4f0126 + 16863fb + 0b66fb3 + c08ce25 + 328de1c + 27a6f70 commit 16ba7e3

File tree

6,736 files changed

+290431
-135266
lines changed

Some content is hidden

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

6,736 files changed

+290431
-135266
lines changed

.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ Oleksij Rempel <[email protected]> <[email protected]>
210210
211211
212212
213+
213214
Paolo 'Blaisorblade' Giarrusso <[email protected]>
214215
Patrick Mochel <[email protected]>
215216
@@ -248,6 +249,7 @@ Sakari Ailus <[email protected]> <[email protected]>
248249
249250
250251
252+
251253
252254
253255

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+
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+
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+
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: 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+
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/debugfs-driver-habanalabs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@ Description: Allows the root user to read or write directly through the
4343
If the IOMMU is disabled, it also allows the root user to read
4444
or write from the host a device VA of a host mapped memory
4545

46+
What: /sys/kernel/debug/habanalabs/hl<n>/data64
47+
Date: Jan 2020
48+
KernelVersion: 5.6
49+
50+
Description: Allows the root user to read or write 64 bit data directly
51+
through the device's PCI bar. Writing to this file generates a
52+
write transaction while reading from the file generates a read
53+
transaction. This custom interface is needed (instead of using
54+
the generic Linux user-space PCI mapping) because the DDR bar
55+
is very small compared to the DDR memory and only the driver can
56+
move the bar before and after the transaction.
57+
If the IOMMU is disabled, it also allows the root user to read
58+
or write from the host a device VA of a host mapped memory
59+
4660
What: /sys/kernel/debug/habanalabs/hl<n>/device
4761
Date: Jan 2019
4862
KernelVersion: 5.1

0 commit comments

Comments
 (0)