Commit 82ffd045 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

Merge tag 'v5.0-rc5' of... 

Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Linux 5.0-rc5

Sync with upstream (which now contains fbdev-v5.0-rc3 changes) to
prepare a base for fbdev-v5.1 changes.
parents 890d14d2 8834f560

.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

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
*.bin

*.bz2

*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtb.S

*.dwo

.mailmap

+8 −4
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>
@@ -47,7 +48,10 @@ Corey Minyard <minyard@acm.org> 
Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -2208,6 +2208,12 @@ N: Christopher Li 
E: sparse@chrisli.org

D: Sparse maintainer 2009 - 2018



N: Shaohua Li

D: Worked on many parts of the kernel, from core x86, ACPI, PCI, KVM, MM,

D: and much more. He was the maintainer of MD from 2016 to 2018. Shaohua

D: passed away late 2018, he will be greatly missed.

W: https://www.spinics.net/lists/raid/msg61993.html



N: Stephan Linz

E: linz@mazet.de

E: Stephan.Linz@gmx.de

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

+40 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ Description: This file shows ASIC health status. The possible values are: 
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/

							cpld1_version

							cpld2_version



Date:		June 2018

KernelVersion:	4.19

Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -21,6 +20,28 @@ Description: These files show with which CPLD versions have been burned 


		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/

							cpld3_version



Date:		November 2018

KernelVersion:	4.21

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.



		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/

							jtag_enable



Date:		November 2018

KernelVersion:	4.21

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.



		The file is read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio

Date:		June 2018

KernelVersion:	4.19
@@ -76,3 +97,21 @@ Description: These files show the system reset cause, as following: power 
		reset cause.



		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/

						reset_comex_pwr_fail

						reset_from_comex

						reset_system

						reset_voltmon_upgrade_fail



Date:		November 2018

KernelVersion:	4.21

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

		due to voltage monitor devices upgrade failure,

		Value 1 in file means this is reset cause, 0 - otherwise.

		Only one bit could be 1 at the same time, representing only

		the last reset cause.



		The files are read only.