Commit 5fc0df93 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge v5.6 into drm-next 



msm needed rc6, so I just went and merged release
(msm has been in drm-next outside of this tree)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 700d6ab9 7111951b

.clang-format

+21 −4
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ ForEachMacros: 
  - 'bio_for_each_segment_all'

  - 'bio_list_for_each'

  - 'bip_for_each_vec'

  - 'bitmap_for_each_clear_region'

  - 'bitmap_for_each_set_region'

  - 'blkg_for_each_descendant_post'

  - 'blkg_for_each_descendant_pre'

  - 'blk_queue_for_each_rl'
@@ -115,6 +117,7 @@ ForEachMacros: 
  - 'drm_client_for_each_connector_iter'

  - 'drm_client_for_each_modeset'

  - 'drm_connector_for_each_possible_encoder'

  - 'drm_for_each_bridge_in_chain'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'

  - 'drm_for_each_encoder'
@@ -136,9 +139,10 @@ ForEachMacros: 
  - 'for_each_bio'

  - 'for_each_board_func_rsrc'

  - 'for_each_bvec'

  - 'for_each_card_auxs'

  - 'for_each_card_auxs_safe'

  - 'for_each_card_components'

  - 'for_each_card_links'

  - 'for_each_card_links_safe'

  - 'for_each_card_pre_auxs'

  - 'for_each_card_prelinks'

  - 'for_each_card_rtds'

  - 'for_each_card_rtds_safe'
@@ -166,6 +170,7 @@ 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'
@@ -190,6 +195,7 @@ ForEachMacros: 
  - 'for_each_lru'

  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'

  - 'for_each_member'

  - 'for_each_memblock'

  - 'for_each_memblock_type'

  - 'for_each_memcg_cache_index'
@@ -200,9 +206,11 @@ ForEachMacros: 
  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'

  - 'for_each_netdev_continue'

  - 'for_each_netdev_continue_rcu'

  - 'for_each_netdev_continue_reverse'

  - 'for_each_netdev_feature'

  - 'for_each_netdev_in_bond_rcu'

  - 'for_each_netdev_rcu'
@@ -254,10 +262,10 @@ ForEachMacros: 
  - 'for_each_reserved_mem_region'

  - 'for_each_rtd_codec_dai'

  - 'for_each_rtd_codec_dai_rollback'

  - 'for_each_rtdcom'

  - 'for_each_rtdcom_safe'

  - 'for_each_rtd_components'

  - 'for_each_set_bit'

  - 'for_each_set_bit_from'

  - 'for_each_set_clump8'

  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'
@@ -267,6 +275,7 @@ ForEachMacros: 
  - 'for_each_subelement_id'

  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_wakeup_source'

  - 'for_each_zone'

  - 'for_each_zone_zonelist'

  - 'for_each_zone_zonelist_nodemask'
@@ -330,6 +339,7 @@ ForEachMacros: 
  - 'list_for_each'

  - 'list_for_each_codec'

  - 'list_for_each_codec_safe'

  - 'list_for_each_continue'

  - 'list_for_each_entry'

  - 'list_for_each_entry_continue'

  - 'list_for_each_entry_continue_rcu'
@@ -351,6 +361,7 @@ ForEachMacros: 
  - 'llist_for_each_entry'

  - 'llist_for_each_entry_safe'

  - 'llist_for_each_safe'

  - 'mci_for_each_dimm'

  - 'media_device_for_each_entity'

  - 'media_device_for_each_intf'

  - 'media_device_for_each_link'
@@ -444,10 +455,16 @@ ForEachMacros: 
  - 'virtio_device_for_each_vq'

  - 'xa_for_each'

  - 'xa_for_each_marked'

  - 'xa_for_each_range'

  - 'xa_for_each_start'

  - 'xas_for_each'

  - 'xas_for_each_conflict'

  - 'xas_for_each_marked'

  - 'xbc_array_for_each_value'

  - 'xbc_for_each_key_value'

  - 'xbc_node_for_each_array_value'

  - 'xbc_node_for_each_child'

  - 'xbc_node_for_each_key_value'

  - 'zorro_for_each_dev'



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

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> 
Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajesh Shah <rajesh.shah@intel.com>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154        |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX GICv3  | #38539          | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456        |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX Core   | #30115          | CAVIUM_ERRATUM_30115        |

Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ properties: 
      - items:

        - const: allwinner,sun7i-a20-crypto

        - const: allwinner,sun4i-a10-crypto

      - items:

        - const: allwinner,sun8i-a33-crypto



  reg:

    maxItems: 1

Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
    * "cypress,tm2-touchkey" - for the touchkey found on the tm2 board

    * "cypress,midas-touchkey" - for the touchkey found on midas boards

    * "cypress,aries-touchkey" - for the touchkey found on aries boards

    * "coreriver,tc360-touchkey" - for the Coreriver TouchCore 360 touchkey

- reg: I2C address of the chip.

- interrupts: interrupt to which the chip is connected (see interrupt

	binding[0]).