Merge branch 'linus' into perf/urgent, to pick up dependent commits (294cbd05) · Commits · e / devices / android_kernel_xiaomi_nabu

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.

Documentation/kbuild/makefiles.txt

+18 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1108,14 +1108,6 @@ When kbuild executes, the following steps are followed (roughly):
	ld		ld
	Link target. Often, LDFLAGS_$@ is used to set specific options to ld.		Link target. Often, LDFLAGS_$@ is used to set specific options to ld.

	objcopy
	Copy binary. Uses OBJCOPYFLAGS usually specified in
	arch/$(ARCH)/Makefile.
	OBJCOPYFLAGS_$@ may be used to set additional options.

	gzip
	Compress target. Use maximum compression to compress target.

	Example:		Example:
	#arch/x86/boot/Makefile		#arch/x86/boot/Makefile
	LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary		LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
	@@ -1139,6 +1131,19 @@ When kbuild executes, the following steps are followed (roughly):
	resulting in the target file being recompiled for no		resulting in the target file being recompiled for no
	obvious reason.		obvious reason.

			objcopy
			Copy binary. Uses OBJCOPYFLAGS usually specified in
			arch/$(ARCH)/Makefile.
			OBJCOPYFLAGS_$@ may be used to set additional options.

			gzip
			Compress target. Use maximum compression to compress target.

			Example:
			#arch/x86/boot/compressed/Makefile
			$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
			$(call if_changed,gzip)

	dtc		dtc
	Create flattened device tree blob object suitable for linking		Create flattened device tree blob object suitable for linking
	into vmlinux. Device tree blobs linked into vmlinux are placed		into vmlinux. Device tree blobs linked into vmlinux are placed
	@@ -1219,7 +1224,7 @@ When kbuild executes, the following steps are followed (roughly):
	that may be shared between individual architectures.		that may be shared between individual architectures.
	The recommended approach how to use a generic header file is		The recommended approach how to use a generic header file is
	to list the file in the Kbuild file.		to list the file in the Kbuild file.
	See "7.3 generic-y" for further info on syntax etc.		See "7.2 generic-y" for further info on syntax etc.

	--- 6.11 Post-link pass		--- 6.11 Post-link pass

	@@ -1299,7 +1304,7 @@ See subsequent chapter for the syntax of the Kbuild file.
	#arch/x86/include/asm/Kbuild		#arch/x86/include/asm/Kbuild
	generated-y += syscalls_32.h		generated-y += syscalls_32.h

	--- 7.5 mandatory-y		--- 7.4 mandatory-y

	mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm		mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm
	to define the minimum set of headers that must be exported in		to define the minimum set of headers that must be exported in

Kbuild

+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:

Kconfig

+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.

MAINTAINERS

+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