Commit 5dee5872 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5_active_speed' into rdma.git for-next 

Leon Romanovsky says:

====================
IBTA declares speed as 16 bits, but kernel stores it in u8. This series
fixes in-kernel declaration while keeping external interface intact.
====================

Based on the mlx5-next branch at
     git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.

* branch 'mlx5_active_speed':
  RDMA: Fix link active_speed size
  RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
  net/mlx5: Refactor query port speed functions
parents c0a6b5ec 376ceb31

.clang-format

+12 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ ForEachMacros: 
  - 'css_for_each_descendant_pre'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros: 
  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'

  - 'for_each_aggr_pgid'

  - 'for_each_available_child_of_node'

  - 'for_each_bio'

  - 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros: 
  - 'for_each_node_state'

  - 'for_each_node_with_cpus'

  - 'for_each_node_with_property'

  - 'for_each_nonreserved_multicast_dest_pgid'

  - 'for_each_of_allnodes'

  - 'for_each_of_allnodes_from'

  - 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros: 
  - 'for_each_pci_dev'

  - 'for_each_pci_msi_entry'

  - 'for_each_pcm_streams'

  - 'for_each_physmem_range'

  - 'for_each_populated_zone'

  - 'for_each_possible_cpu'

  - 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros: 
  - 'for_each_process_thread'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_requested_gpio'

  - 'for_each_requested_gpio_in_range'

  - 'for_each_reserved_mem_region'

  - 'for_each_rtd_codec_dais'

  - 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros: 
  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'

  - 'for_each_sgtable_dma_page'

  - 'for_each_sgtable_dma_sg'

  - 'for_each_sgtable_page'

  - 'for_each_sgtable_sg'

  - 'for_each_sibling_event'

  - 'for_each_subelement'

  - 'for_each_subelement_extid'

  - 'for_each_subelement_id'

  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_unicast_dest_pgid'

  - 'for_each_wakeup_source'

  - 'for_each_zone'

  - 'for_each_zone_zonelist'
@@ -465,6 +476,7 @@ ForEachMacros: 
  - 'v4l2_m2m_for_each_src_buf'

  - 'v4l2_m2m_for_each_src_buf_safe'

  - 'virtio_device_for_each_vq'

  - 'while_for_each_ftrace_op'

  - 'xa_for_each'

  - 'xa_for_each_marked'

  - 'xa_for_each_range'

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Documentation/RCU/lockdep.rst

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives: 
		is invoked by both RCU-sched readers and updaters.

	srcu_dereference_check(p, c):

		Use explicit check expression "c" along with

		srcu_read_lock_held()().  This is useful in code that

		srcu_read_lock_held().  This is useful in code that

		is invoked by both SRCU readers and updaters.

	rcu_dereference_raw(p):

		Don't check.  (Use sparingly, if at all.)

Documentation/admin-guide/devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ 


  98 block	User-mode virtual block device

		  0 = /dev/ubda		First user-mode block device

		 16 = /dev/udbb		Second user-mode block device

		 16 = /dev/ubdb		Second user-mode block device

		    ...



		Partitions are handled in the same way as for IDE

Documentation/admin-guide/dynamic-debug-howto.rst

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ against. Possible keywords are::: 
  ``line-range`` cannot contain space, e.g.

  "1-30" is valid range but "1 - 30" is not.



  ``module=foo`` combined keyword=value form is interchangably accepted



The meanings of each keyword are:

CRA Git | Maintained and supported by SUSTech CRA and CCSE