Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus',... (16ba7e31) · Commits · 戴 / test

.clang-format

+14 −4

Original line number	Diff line number	Diff line
		@@ -142,10 +142,13 @@ ForEachMacros:
		- 'for_each_card_auxs'
		- 'for_each_card_auxs_safe'
		- 'for_each_card_components'
		- 'for_each_card_dapms'
		- 'for_each_card_pre_auxs'
		- 'for_each_card_prelinks'
		- 'for_each_card_rtds'
		- 'for_each_card_rtds_safe'
		- 'for_each_card_widgets'
		- 'for_each_card_widgets_safe'
		- 'for_each_cgroup_storage_type'
		- 'for_each_child_of_node'
		- 'for_each_clear_bit'
		@@ -160,6 +163,7 @@ ForEachMacros:
		- 'for_each_cpu_and'
		- 'for_each_cpu_not'
		- 'for_each_cpu_wrap'
		- 'for_each_dapm_widgets'
		- 'for_each_dev_addr'
		- 'for_each_dev_scope'
		- 'for_each_displayid_db'
		@@ -170,7 +174,6 @@ ForEachMacros:
		- 'for_each_dpcm_fe'
		- 'for_each_drhd_unit'
		- 'for_each_dss_dev'
		- 'for_each_efi_handle'
		- 'for_each_efi_memory_desc'
		- 'for_each_efi_memory_desc_in_map'
		- 'for_each_element'
		@@ -191,6 +194,7 @@ ForEachMacros:
		- 'for_each_ip_tunnel_rcu'
		- 'for_each_irq_nr'
		- 'for_each_link_codecs'
		- 'for_each_link_cpus'
		- 'for_each_link_platforms'
		- 'for_each_lru'
		- 'for_each_matching_node'
		@@ -250,6 +254,7 @@ ForEachMacros:
		- 'for_each_pci_bridge'
		- 'for_each_pci_dev'
		- 'for_each_pci_msi_entry'
		- 'for_each_pcm_streams'
		- 'for_each_populated_zone'
		- 'for_each_possible_cpu'
		- 'for_each_present_cpu'
		@@ -260,9 +265,12 @@ ForEachMacros:
		- 'for_each_property_of_node'
		- 'for_each_registered_fb'
		- 'for_each_reserved_mem_region'
		- 'for_each_rtd_codec_dai'
		- 'for_each_rtd_codec_dai_rollback'
		- 'for_each_rtd_codec_dais'
		- 'for_each_rtd_codec_dais_rollback'
		- 'for_each_rtd_components'
		- 'for_each_rtd_cpu_dais'
		- 'for_each_rtd_cpu_dais_rollback'
		- 'for_each_rtd_dais'
		- 'for_each_set_bit'
		- 'for_each_set_bit_from'
		- 'for_each_set_clump8'
		@@ -334,6 +342,7 @@ ForEachMacros:
		- 'klp_for_each_object'
		- 'klp_for_each_object_safe'
		- 'klp_for_each_object_static'
		- 'kunit_suite_for_each_test_case'
		- 'kvm_for_each_memslot'
		- 'kvm_for_each_vcpu'
		- 'list_for_each'
		@@ -387,6 +396,7 @@ ForEachMacros:
		- 'of_property_for_each_string'
		- 'of_property_for_each_u32'
		- 'pci_bus_for_each_resource'
		- 'pcm_for_each_format'
		- 'ping_portaddr_for_each_entry'
		- 'plist_for_each'
		- 'plist_for_each_continue'
		@@ -482,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
		MacroBlockBegin: ''
		MacroBlockEnd: ''
		MaxEmptyLinesToKeep: 1
		NamespaceIndentation: Inner
		NamespaceIndentation: None
		#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
		ObjCBlockIndentWidth: 8
		ObjCSpaceAfterProperty: true

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		#
		# NOTE! Don't add files that are generated in specific
		# subdirectories here. Add them in the ".gitignore" file

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
		@@ -248,6 +249,7 @@ Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
		Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
		Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Documentation/.gitignore

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		output
		*.pyc

Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		This ABI is renamed and moved to a new location /sys/kernel/fadump/enabled.

		What: /sys/kernel/fadump_enabled
		Date: Feb 2012
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: read only
		Primarily used to identify whether the FADump is enabled in
		the kernel or not.
		User: Kdump service

Admin message