Commit 70f0ba9f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents cd07e536 76c057c8
Loading
Loading
Loading
Loading
+2 −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>
@@ -55,6 +52,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
Ben Gardner <bgardner@wabtec.com>
Ben M Cahill <ben.m.cahill@intel.com>
Björn Steinbrink <B.Steinbrink@gmx.de>
Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
+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
+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.
+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.
+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
Loading