Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'arm/mediatek',... (d05e4c86) · Commits · e / devices / android_kernel_fairphone_FP5

.clang-format

+42 −1

Original line number	Diff line number	Diff line
		@@ -72,6 +72,10 @@ ForEachMacros:
		- 'apei_estatus_for_each_section'
		- 'ata_for_each_dev'
		- 'ata_for_each_link'
		- '__ata_qc_for_each'
		- 'ata_qc_for_each'
		- 'ata_qc_for_each_raw'
		- 'ata_qc_for_each_with_internal'
		- 'ax25_for_each'
		- 'ax25_uid_for_each'
		- 'bio_for_each_integrity_vec'
		@@ -85,6 +89,7 @@ ForEachMacros:
		- 'blk_queue_for_each_rl'
		- 'bond_for_each_slave'
		- 'bond_for_each_slave_rcu'
		- 'bpf_for_each_spilled_reg'
		- 'btree_for_each_safe128'
		- 'btree_for_each_safe32'
		- 'btree_for_each_safe64'
		@@ -103,6 +108,8 @@ ForEachMacros:
		- 'drm_atomic_crtc_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane_state'
		- 'drm_atomic_for_each_plane_damage'
		- 'drm_connector_for_each_possible_encoder'
		- 'drm_for_each_connector_iter'
		- 'drm_for_each_crtc'
		- 'drm_for_each_encoder'
		@@ -121,11 +128,21 @@ ForEachMacros:
		- 'for_each_bio'
		- 'for_each_board_func_rsrc'
		- 'for_each_bvec'
		- 'for_each_card_components'
		- 'for_each_card_links'
		- 'for_each_card_links_safe'
		- 'for_each_card_prelinks'
		- 'for_each_card_rtds'
		- 'for_each_card_rtds_safe'
		- 'for_each_cgroup_storage_type'
		- 'for_each_child_of_node'
		- 'for_each_clear_bit'
		- 'for_each_clear_bit_from'
		- 'for_each_cmsghdr'
		- 'for_each_compatible_node'
		- 'for_each_component_dais'
		- 'for_each_component_dais_safe'
		- 'for_each_comp_order'
		- 'for_each_console'
		- 'for_each_cpu'
		- 'for_each_cpu_and'
		@@ -133,6 +150,10 @@ ForEachMacros:
		- 'for_each_cpu_wrap'
		- 'for_each_dev_addr'
		- 'for_each_dma_cap_mask'
		- 'for_each_dpcm_be'
		- 'for_each_dpcm_be_rollback'
		- 'for_each_dpcm_be_safe'
		- 'for_each_dpcm_fe'
		- 'for_each_drhd_unit'
		- 'for_each_dss_dev'
		- 'for_each_efi_memory_desc'
		@@ -149,6 +170,7 @@ ForEachMacros:
		- 'for_each_iommu'
		- 'for_each_ip_tunnel_rcu'
		- 'for_each_irq_nr'
		- 'for_each_link_codecs'
		- 'for_each_lru'
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		@@ -160,6 +182,7 @@ ForEachMacros:
		- 'for_each_mem_range_rev'
		- 'for_each_migratetype_order'
		- 'for_each_msi_entry'
		- 'for_each_msi_entry_safe'
		- 'for_each_net'
		- 'for_each_netdev'
		- 'for_each_netdev_continue'
		@@ -183,12 +206,14 @@ ForEachMacros:
		- 'for_each_node_with_property'
		- 'for_each_of_allnodes'
		- 'for_each_of_allnodes_from'
		- 'for_each_of_cpu_node'
		- 'for_each_of_pci_range'
		- 'for_each_old_connector_in_state'
		- 'for_each_old_crtc_in_state'
		- 'for_each_oldnew_connector_in_state'
		- 'for_each_oldnew_crtc_in_state'
		- 'for_each_oldnew_plane_in_state'
		- 'for_each_oldnew_plane_in_state_reverse'
		- 'for_each_oldnew_private_obj_in_state'
		- 'for_each_old_plane_in_state'
		- 'for_each_old_private_obj_in_state'
		@@ -206,14 +231,17 @@ ForEachMacros:
		- 'for_each_process'
		- 'for_each_process_thread'
		- 'for_each_property_of_node'
		- 'for_each_registered_fb'
		- 'for_each_reserved_mem_region'
		- 'for_each_resv_unavail_range'
		- 'for_each_rtd_codec_dai'
		- 'for_each_rtd_codec_dai_rollback'
		- 'for_each_rtdcom'
		- 'for_each_rtdcom_safe'
		- 'for_each_set_bit'
		- 'for_each_set_bit_from'
		- 'for_each_sg'
		- 'for_each_sg_page'
		- 'for_each_sibling_event'
		- '__for_each_thread'
		- 'for_each_thread'
		- 'for_each_zone'
		@@ -251,6 +279,8 @@ ForEachMacros:
		- 'hlist_nulls_for_each_entry_from'
		- 'hlist_nulls_for_each_entry_rcu'
		- 'hlist_nulls_for_each_entry_safe'
		- 'i3c_bus_for_each_i2cdev'
		- 'i3c_bus_for_each_i3cdev'
		- 'ide_host_for_each_port'
		- 'ide_port_for_each_dev'
		- 'ide_port_for_each_present_dev'
		@@ -267,11 +297,14 @@ ForEachMacros:
		- 'kvm_for_each_memslot'
		- 'kvm_for_each_vcpu'
		- 'list_for_each'
		- 'list_for_each_codec'
		- 'list_for_each_codec_safe'
		- 'list_for_each_entry'
		- 'list_for_each_entry_continue'
		- 'list_for_each_entry_continue_rcu'
		- 'list_for_each_entry_continue_reverse'
		- 'list_for_each_entry_from'
		- 'list_for_each_entry_from_rcu'
		- 'list_for_each_entry_from_reverse'
		- 'list_for_each_entry_lockless'
		- 'list_for_each_entry_rcu'
		@@ -291,6 +324,7 @@ ForEachMacros:
		- 'media_device_for_each_intf'
		- 'media_device_for_each_link'
		- 'media_device_for_each_pad'
		- 'nanddev_io_for_each_page'
		- 'netdev_for_each_lower_dev'
		- 'netdev_for_each_lower_private'
		- 'netdev_for_each_lower_private_rcu'
		@@ -357,12 +391,14 @@ ForEachMacros:
		- 'sk_nulls_for_each'
		- 'sk_nulls_for_each_from'
		- 'sk_nulls_for_each_rcu'
		- 'snd_array_for_each'
		- 'snd_pcm_group_for_each_entry'
		- 'snd_soc_dapm_widget_for_each_path'
		- 'snd_soc_dapm_widget_for_each_path_safe'
		- 'snd_soc_dapm_widget_for_each_sink_path'
		- 'snd_soc_dapm_widget_for_each_source_path'
		- 'tb_property_for_each'
		- 'tcf_exts_for_each_action'
		- 'udp_portaddr_for_each_entry'
		- 'udp_portaddr_for_each_entry_rcu'
		- 'usb_hub_for_each_child'
		@@ -371,6 +407,11 @@ ForEachMacros:
		- 'v4l2_m2m_for_each_dst_buf_safe'
		- 'v4l2_m2m_for_each_src_buf'
		- 'v4l2_m2m_for_each_src_buf_safe'
		- 'virtio_device_for_each_vq'
		- 'xa_for_each'
		- 'xas_for_each'
		- 'xas_for_each_conflict'
		- 'xas_for_each_marked'
		- 'zorro_for_each_dev'

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

CREDITS

+9 −11

Original line number	Diff line number	Diff line
		@@ -842,10 +842,9 @@ D: ax25-utils maintainer.

		N: Helge Deller
		E: deller@gmx.de
		E: hdeller@redhat.de
		D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
		S: Schimmelsrain 1
		S: D-69231 Rauenberg
		W: http://www.parisc-linux.org/
		D: PA-RISC Linux architecture maintainer
		D: LASI-, ASP-, WAX-, LCD/LED-driver
		S: Germany

		N: Jean Delvare
		@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
		S: South Africa

		N: Grant Grundler
		E: grundler@parisc-linux.org
		E: grantgrundler@gmail.com
		W: http://obmouse.sourceforge.net/
		W: http://www.parisc-linux.org/
		D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
		@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
		S: USA

		N: Kyle McMartin
		E: kyle@parisc-linux.org
		E: kyle@mcmartin.ca
		D: Linux/PARISC hacker
		D: AD1889 sound driver
		S: Ottawa, Canada
		@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
		S: Cupertino, CA 95014
		S: USA

		N: Thibaut Varene
		E: T-Bone@parisc-linux.org
		W: http://www.parisc-linux.org/~varenet/
		P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
		N: Thibaut Varène
		E: hacks+kernel@slashdirt.org
		W: http://hacks.slashdirt.org/
		D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
		D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
		D: AD1889 sound driver
		S: Paris, France
		S: France

		N: Heikki Vatiainen
		E: hessu@cs.tut.fi

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		cpld3_version

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.
		@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		jtag_enable

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files enable and disable the access to the JTAG domain.
		By default access to the JTAG domain is disabled.
		@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		reset_voltmon_upgrade_fail

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show the system reset cause, as following: ComEx
		power fail, reset from ComEx, system platform reset, reset

Documentation/ABI/testing/sysfs-block

+9 −0

Original line number	Diff line number	Diff line
		@@ -279,3 +279,12 @@ Description:
		size in 512B sectors of the zones of the device, with
		the eventual exception of the last zone of the device
		which may be smaller.

		What: /sys/block/<disk>/queue/io_timeout
		Date: November 2018
		Contact: Weiping Zhang <zhangweiping@didiglobal.com>
		Description:
		io_timeout is the request timeout in milliseconds. If a request
		does not complete in this time then the block driver timeout
		handler is invoked. That timeout handler can decide to retry
		the request, to fail it or to start a device recovery strategy.

Documentation/ABI/testing/sysfs-block-zram

+9 −2

Original line number	Diff line number	Diff line
		@@ -122,11 +122,18 @@ Description:
		statistics (bd_count, bd_reads, bd_writes) in a format
		similar to block layer statistics file format.

		What: /sys/block/zram<id>/writeback_limit_enable
		Date: November 2018
		Contact: Minchan Kim <minchan@kernel.org>
		Description:
		The writeback_limit_enable file is read-write and specifies
		eanbe of writeback_limit feature. "1" means eable the feature.
		No limit "0" is the initial state.

		What: /sys/block/zram<id>/writeback_limit
		Date: November 2018
		Contact: Minchan Kim <minchan@kernel.org>
		Description:
		The writeback_limit file is read-write and specifies the maximum
		amount of writeback ZRAM can do. The limit could be changed
		in run time and "0" means disable the limit.
		No limit is the initial state.
		in run time.