Merge branch 'linus' into core/urgent, to pick up dependent commits (649e441f) · Commits · jan.koester / Linux

Documentation/ABI/testing/sysfs-devices-power

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -211,9 +211,7 @@ Description:
	device, after it has been suspended at run time, from a resume		device, after it has been suspended at run time, from a resume
	request to the moment the device will be ready to process I/O,		request to the moment the device will be ready to process I/O,
	in microseconds. If it is equal to 0, however, this means that		in microseconds. If it is equal to 0, however, this means that
	the PM QoS resume latency may be arbitrary and the special value		the PM QoS resume latency may be arbitrary.
	"n/a" means that user space cannot accept any resume latency at
	all for the given device.

	Not all drivers support this attribute. If it isn't supported,		Not all drivers support this attribute. If it isn't supported,
	it is not present.		it is not present.

+1 −0

Original line number	Original line	Diff line number	Diff line
			# SPDX-License-Identifier: GPL-2.0
	#		#
	# Kbuild for top-level directory of the kernel		# Kbuild for top-level directory of the kernel
	# This file takes care of the following:		# This file takes care of the following:

+1 −0

Original line number	Original line	Diff line number	Diff line
			# SPDX-License-Identifier: GPL-2.0
	#		#
	# For a description of the syntax of this configuration file,		# For a description of the syntax of this configuration file,
	# see Documentation/kbuild/kconfig-language.txt.		# see Documentation/kbuild/kconfig-language.txt.

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6671,7 +6671,7 @@ F: include/net/ieee802154_netdev.h
	F: Documentation/networking/ieee802154.txt		F: Documentation/networking/ieee802154.txt

	IFE PROTOCOL		IFE PROTOCOL
	M: Yotam Gigi <yotamg@mellanox.com>		M: Yotam Gigi <yotam.gi@gmail.com>
	M: Jamal Hadi Salim <jhs@mojatatu.com>		M: Jamal Hadi Salim <jhs@mojatatu.com>
	F: net/ife		F: net/ife
	F: include/net/ife.h		F: include/net/ife.h
	@@ -8743,7 +8743,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/
	F: drivers/net/ethernet/mellanox/mlxsw/		F: drivers/net/ethernet/mellanox/mlxsw/

	MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)		MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
	M: Yotam Gigi <yotamg@mellanox.com>		M: mlxsw@mellanox.com
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Supported
	W: http://www.mellanox.com		W: http://www.mellanox.com
	@@ -10890,7 +10890,7 @@ S: Maintained
	F: drivers/block/ps3vram.c		F: drivers/block/ps3vram.c

	PSAMPLE PACKET SAMPLING SUPPORT:		PSAMPLE PACKET SAMPLING SUPPORT:
	M: Yotam Gigi <yotamg@mellanox.com>		M: Yotam Gigi <yotam.gi@gmail.com>
	S: Maintained		S: Maintained
	F: net/psample		F: net/psample
	F: include/net/psample.h		F: include/net/psample.h

+1 −0