Commit c358f952 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



drivers/net/can/dev.c
  b552766c ("can: dev: prevent potential information leak in can_fill_info()")
  3e77f70e ("can: dev: move driver related infrastructure into separate subdir")
  0a042c6e ("can: dev: move netlink related code into seperate file")

  Code move.

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
  57ac4a31 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
  214baf22 ("net/mlx5e: Support HTB offload")

  Adjacent code changes

net/switchdev/switchdev.c
  20776b46 ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
  ffb68fc5 ("net: switchdev: remove the transaction structure from port object notifiers")
  bae33f2b ("net: switchdev: remove the transaction structure from port attributes")

  Transaction parameter gets dropped otherwise keep the fix.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 24a790da 909b447d

.mailmap

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#

# Please keep this list dictionary sorted.

#

# This comment is parsed by git-shortlog:

# repo-abbrev: /pub/scm/linux/kernel/git/

#

Aaron Durbin <adurbin@google.com>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>

Documentation/ABI/testing/sysfs-class-devlink

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ Description: 
		Provide a place in sysfs for the device link objects in the

		kernel at any given time.  The name of a device link directory,

		denoted as ... above, is of the form <supplier>--<consumer>

		where <supplier> is the supplier device name and <consumer> is

		the consumer device name.

		where <supplier> is the supplier bus:device name and <consumer>

		is the consumer bus:device name.



What:		/sys/class/devlink/.../auto_remove_on

Date:		May 2020

Documentation/ABI/testing/sysfs-devices-consumer

+3 −2
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <saravanak@google.com> 
Description:

		The /sys/devices/.../consumer:<consumer> are symlinks to device

		links where this device is the supplier. <consumer> denotes the

		name of the consumer in that device link. There can be zero or

		more of these symlinks for a given device.
 
		name of the consumer in that device link and is of the form

		bus:device name. There can be zero or more of these symlinks

		for a given device.

Documentation/ABI/testing/sysfs-devices-supplier

+3 −2
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <saravanak@google.com> 
Description:

		The /sys/devices/.../supplier:<supplier> are symlinks to device

		links where this device is the consumer. <supplier> denotes the

		name of the supplier in that device link. There can be zero or

		more of these symlinks for a given device.
 
		name of the supplier in that device link and is of the form

		bus:device name. There can be zero or more of these symlinks

		for a given device.

Documentation/ABI/testing/sysfs-driver-ufs

+22 −14
Original line number Diff line number Diff line
@@ -916,21 +916,25 @@ Date: September 2014 
Contact:	Subhash Jadavani <subhashj@codeaurora.org>

Description:	This entry could be used to set or show the UFS device

		runtime power management level. The current driver

		implementation supports 6 levels with next target states:

		implementation supports 7 levels with next target states:



		==  ====================================================

		0   an UFS device will stay active, an UIC link will

		0   UFS device will stay active, UIC link will

		    stay active

		1   an UFS device will stay active, an UIC link will

		1   UFS device will stay active, UIC link will

		    hibernate

		2   an UFS device will moved to sleep, an UIC link will

		2   UFS device will be moved to sleep, UIC link will

		    stay active

		3   an UFS device will moved to sleep, an UIC link will

		3   UFS device will be moved to sleep, UIC link will

		    hibernate

		4   an UFS device will be powered off, an UIC link will

		4   UFS device will be powered off, UIC link will

		    hibernate

		5   an UFS device will be powered off, an UIC link will

		5   UFS device will be powered off, UIC link will

		    be powered off

		6   UFS device will be moved to deep sleep, UIC link

		    will be powered off. Note, deep sleep might not be

		    supported in which case this value will not be

		    accepted

		==  ====================================================



What:		/sys/bus/platform/drivers/ufshcd/*/rpm_target_dev_state
@@ -954,21 +958,25 @@ Date: September 2014 
Contact:	Subhash Jadavani <subhashj@codeaurora.org>

Description:	This entry could be used to set or show the UFS device

		system power management level. The current driver

		implementation supports 6 levels with next target states:

		implementation supports 7 levels with next target states:



		==  ====================================================

		0   an UFS device will stay active, an UIC link will

		0   UFS device will stay active, UIC link will

		    stay active

		1   an UFS device will stay active, an UIC link will

		1   UFS device will stay active, UIC link will

		    hibernate

		2   an UFS device will moved to sleep, an UIC link will

		2   UFS device will be moved to sleep, UIC link will

		    stay active

		3   an UFS device will moved to sleep, an UIC link will

		3   UFS device will be moved to sleep, UIC link will

		    hibernate

		4   an UFS device will be powered off, an UIC link will

		4   UFS device will be powered off, UIC link will

		    hibernate

		5   an UFS device will be powered off, an UIC link will

		5   UFS device will be powered off, UIC link will

		    be powered off

		6   UFS device will be moved to deep sleep, UIC link

		    will be powered off. Note, deep sleep might not be

		    supported in which case this value will not be

		    accepted

		==  ====================================================



What:		/sys/bus/platform/drivers/ufshcd/*/spm_target_dev_state