Merge 4.18-rc5 into staging-next (956f004a) · Commits · jan.koester / Linux

Documentation/admin-guide/kernel-parameters.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4846,3 +4846,8 @@
	xirc2ps_cs= [NET,PCMCIA]		xirc2ps_cs= [NET,PCMCIA]
	Format:		Format:
	<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]		<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

			xhci-hcd.quirks [USB,KNL]
			A hex value specifying bitmask with supplemental xhci
			host controller quirks. Meaning of each bit can be
			consulted in header drivers/usb/host/xhci.h.

Documentation/kbuild/kbuild.txt

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,11 @@ LDFLAGS_MODULE
	--------------------------------------------------		--------------------------------------------------
	Additional options used for $(LD) when linking modules.		Additional options used for $(LD) when linking modules.

			KBUILD_KCONFIG
			--------------------------------------------------
			Set the top-level Kconfig file to the value of this environment
			variable. The default name is "Kconfig".

	KBUILD_VERBOSE		KBUILD_VERBOSE
	--------------------------------------------------		--------------------------------------------------
	Set the kbuild verbosity. Can be assigned same values as "V=...".		Set the kbuild verbosity. Can be assigned same values as "V=...".
	@@ -88,7 +93,8 @@ In most cases the name of the architecture is the same as the
	directory name found in the arch/ directory.		directory name found in the arch/ directory.
	But some architectures such as x86 and sparc have aliases.		But some architectures such as x86 and sparc have aliases.
	x86: i386 for 32 bit, x86_64 for 64 bit		x86: i386 for 32 bit, x86_64 for 64 bit
	sparc: sparc for 32 bit, sparc64 for 64 bit		sh: sh for 32 bit, sh64 for 64 bit
			sparc: sparc32 for 32 bit, sparc64 for 64 bit

	CROSS_COMPILE		CROSS_COMPILE
	--------------------------------------------------		--------------------------------------------------
	@@ -148,15 +154,6 @@ stripped after they are installed. If INSTALL_MOD_STRIP is '1', then
	the default option --strip-debug will be used. Otherwise,		the default option --strip-debug will be used. Otherwise,
	INSTALL_MOD_STRIP value will be used as the options to the strip command.		INSTALL_MOD_STRIP value will be used as the options to the strip command.

	INSTALL_FW_PATH
	--------------------------------------------------
	INSTALL_FW_PATH specifies where to install the firmware blobs.
	The default value is:

	$(INSTALL_MOD_PATH)/lib/firmware

	The value can be overridden in which case the default value is ignored.

	INSTALL_HDR_PATH		INSTALL_HDR_PATH
	--------------------------------------------------		--------------------------------------------------
	INSTALL_HDR_PATH specifies where to install user space headers when		INSTALL_HDR_PATH specifies where to install user space headers when

Documentation/kbuild/kconfig.txt

+43 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,9 @@ This file contains some assistance for using "make *config".

	Use "make help" to list all of the possible configuration targets.		Use "make help" to list all of the possible configuration targets.

	The xconfig ('qconf') and menuconfig ('mconf') programs also		The xconfig ('qconf'), menuconfig ('mconf'), and nconfig ('nconf')
	have embedded help text. Be sure to check it for navigation,		programs also have embedded help text. Be sure to check that for
	search, and other general help text.		navigation, search, and other general help text.

	======================================================================		======================================================================
	General		General
	@@ -17,13 +17,16 @@ this happens, using a previously working .config file and running
	for you, so you may find that you need to see what NEW kernel		for you, so you may find that you need to see what NEW kernel
	symbols have been introduced.		symbols have been introduced.

	To see a list of new config symbols when using "make oldconfig", use		To see a list of new config symbols, use

	cp user/some/old.config .config		cp user/some/old.config .config
	make listnewconfig		make listnewconfig

	and the config program will list any new symbols, one per line.		and the config program will list any new symbols, one per line.

			Alternatively, you can use the brute force method:

			make oldconfig
	scripts/diffconfig .config.old .config \| less		scripts/diffconfig .config.old .config \| less

	______________________________________________________________________		______________________________________________________________________
	@@ -160,7 +163,7 @@ Searching in menuconfig:
	This lists all config symbols that contain "hotplug",		This lists all config symbols that contain "hotplug",
	e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.		e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.

	For search help, enter / followed TAB-TAB-TAB (to highlight		For search help, enter / followed by TAB-TAB (to highlight
	<Help>) and Enter. This will tell you that you can also use		<Help>) and Enter. This will tell you that you can also use
	regular expressions (regexes) in the search string, so if you		regular expressions (regexes) in the search string, so if you
	are not interested in MEMORY_HOTPLUG, you could try		are not interested in MEMORY_HOTPLUG, you could try
	@@ -202,6 +205,39 @@ Example:
	make MENUCONFIG_MODE=single_menu menuconfig		make MENUCONFIG_MODE=single_menu menuconfig


			======================================================================
			nconfig
			--------------------------------------------------

			nconfig is an alternate text-based configurator. It lists function
			keys across the bottom of the terminal (window) that execute commands.
			You can also just use the corresponding numeric key to execute the
			commands unless you are in a data entry window. E.g., instead of F6
			for Save, you can just press 6.

			Use F1 for Global help or F3 for the Short help menu.

			Searching in nconfig:

			You can search either in the menu entry "prompt" strings
			or in the configuration symbols.

			Use / to begin a search through the menu entries. This does
			not support regular expressions. Use <Down> or <Up> for
			Next hit and Previous hit, respectively. Use <Esc> to
			terminate the search mode.

			F8 (SymSearch) searches the configuration symbols for the
			given string or regular expression (regex).

			NCONFIG_MODE
			--------------------------------------------------
			This mode shows all sub-menus in one large tree.

			Example:
			make NCONFIG_MODE=single_menu nconfig


	======================================================================		======================================================================
	xconfig		xconfig
	--------------------------------------------------		--------------------------------------------------
	@@ -230,8 +266,7 @@ gconfig

	Searching in gconfig:		Searching in gconfig:

	None (gconfig isn't maintained as well as xconfig or menuconfig);		There is no search command in gconfig. However, gconfig does
	however, gconfig does have a few more viewing choices than		have several different viewing choices, modes, and options.
	xconfig does.

	###		###

MAINTAINERS

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -581,7 +581,7 @@ W: https://www.infradead.org/~dhowells/kafs/

	AGPGART DRIVER		AGPGART DRIVER
	M: David Airlie <airlied@linux.ie>		M: David Airlie <airlied@linux.ie>
	T: git git://people.freedesktop.org/~airlied/linux (part of drm maint)		T: git git://anongit.freedesktop.org/drm/drm
	S: Maintained		S: Maintained
	F: drivers/char/agp/		F: drivers/char/agp/
	F: include/linux/agp*		F: include/linux/agp*
	@@ -4468,6 +4468,7 @@ F: Documentation/blockdev/drbd/

	DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS		DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
	M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
			R: "Rafael J. Wysocki" <rafael@kernel.org>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
	S: Supported		S: Supported
	F: Documentation/kobject.txt		F: Documentation/kobject.txt
	@@ -4638,7 +4639,7 @@ F: include/uapi/drm/vmwgfx_drm.h
	DRM DRIVERS		DRM DRIVERS
	M: David Airlie <airlied@linux.ie>		M: David Airlie <airlied@linux.ie>
	L: dri-devel@lists.freedesktop.org		L: dri-devel@lists.freedesktop.org
	T: git git://people.freedesktop.org/~airlied/linux		T: git git://anongit.freedesktop.org/drm/drm
	B: https://bugs.freedesktop.org/		B: https://bugs.freedesktop.org/
	C: irc://chat.freenode.net/dri-devel		C: irc://chat.freenode.net/dri-devel
	S: Maintained		S: Maintained
	@@ -10232,11 +10233,13 @@ F: sound/soc/codecs/sgtl5000*

	NXP TDA998X DRM DRIVER		NXP TDA998X DRM DRIVER
	M: Russell King <linux@armlinux.org.uk>		M: Russell King <linux@armlinux.org.uk>
	S: Supported		S: Maintained
	T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel		T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
	T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes		T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
	F: drivers/gpu/drm/i2c/tda998x_drv.c		F: drivers/gpu/drm/i2c/tda998x_drv.c
	F: include/drm/i2c/tda998x.h		F: include/drm/i2c/tda998x.h
			F: include/dt-bindings/display/tda998x.h
			K: "nxp,tda998x"

	NXP TFA9879 DRIVER		NXP TFA9879 DRIVER
	M: Peter Rosin <peda@axentia.se>		M: Peter Rosin <peda@axentia.se>
	@@ -11854,7 +11857,7 @@ S: Supported
	F: arch/hexagon/		F: arch/hexagon/

	QUALCOMM HIDMA DRIVER		QUALCOMM HIDMA DRIVER
	M: Sinan Kaya <okaya@codeaurora.org>		M: Sinan Kaya <okaya@kernel.org>
	L: linux-arm-kernel@lists.infradead.org		L: linux-arm-kernel@lists.infradead.org
	L: linux-arm-msm@vger.kernel.org		L: linux-arm-msm@vger.kernel.org
	L: dmaengine@vger.kernel.org		L: dmaengine@vger.kernel.org

Makefile

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 18		PATCHLEVEL = 18
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc3		EXTRAVERSION = -rc5
	NAME = Merciless Moray		NAME = Merciless Moray

	# DOCUMENTATION		# DOCUMENTATION
	@@ -353,9 +353,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
	else if [ -x /bin/bash ]; then echo /bin/bash; \		else if [ -x /bin/bash ]; then echo /bin/bash; \
	else echo sh; fi ; fi)		else echo sh; fi ; fi)

	HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS)		HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)
	HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS)		HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)
	HOST_LFS_LIBS := $(shell getconf LFS_LIBS)		HOST_LFS_LIBS := $(shell getconf LFS_LIBS 2>/dev/null)

	HOSTCC = gcc		HOSTCC = gcc
	HOSTCXX = g++		HOSTCXX = g++
	@@ -507,11 +507,6 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLA
	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO		KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
	endif		endif

	ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/cc-can-link.sh $(CC)), y)
	CC_CAN_LINK := y
	export CC_CAN_LINK
	endif

	# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.		# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
	# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.		# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
	# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),		# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
	@@ -1717,6 +1712,6 @@ endif # skip-makefile
	PHONY += FORCE		PHONY += FORCE
	FORCE:		FORCE:

	# Declare the contents of the .PHONY variable as phony. We keep that		# Declare the contents of the PHONY variable as phony. We keep that
	# information in a variable so we can use it in if_changed and friends.		# information in a variable so we can use it in if_changed and friends.
	.PHONY: $(PHONY)		.PHONY: $(PHONY)