Merge 5.14-rc5 into driver-core-next (bd935a7b) · Commits · jan.koester / Linux

Documentation/networking/netdev-FAQ.rst

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -228,6 +228,23 @@ before posting to the mailing list. The patchwork build bot instance
	gets overloaded very easily and netdev@vger really doesn't need more		gets overloaded very easily and netdev@vger really doesn't need more
	traffic if we can help it.		traffic if we can help it.

			netdevsim is great, can I extend it for my out-of-tree tests?
			-------------------------------------------------------------

			No, `netdevsim` is a test vehicle solely for upstream tests.
			(Please add your tests under tools/testing/selftests/.)

			We also give no guarantees that `netdevsim` won't change in the future
			in a way which would break what would normally be considered uAPI.

			Is netdevsim considered a "user" of an API?
			-------------------------------------------

			Linux kernel has a long standing rule that no API should be added unless
			it has a real, in-tree user. Mock-ups and tests based on `netdevsim` are
			strongly encouraged when adding new APIs, but `netdevsim` in itself
			is not considered a use case/user.

	Any other tips to help ensure my net/net-next patch gets OK'd?		Any other tips to help ensure my net/net-next patch gets OK'd?
	--------------------------------------------------------------		--------------------------------------------------------------
	Attention to detail. Re-read your own work as if you were the		Attention to detail. Re-read your own work as if you were the

Documentation/networking/operstates.rst

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,9 @@ IF_OPER_LOWERLAYERDOWN (3):
	state (f.e. VLAN).		state (f.e. VLAN).

	IF_OPER_TESTING (4):		IF_OPER_TESTING (4):
	Unused in current kernel.		Interface is in testing mode, for example executing driver self-tests
			or media (cable) test. It can't be used for normal traffic until tests
			complete.

	IF_OPER_DORMANT (5):		IF_OPER_DORMANT (5):
	Interface is L1 up, but waiting for an external event, f.e. for a		Interface is L1 up, but waiting for an external event, f.e. for a
	@@ -111,7 +113,7 @@ it as lower layer.

	Note that for certain kind of soft-devices, which are not managing any		Note that for certain kind of soft-devices, which are not managing any
	real hardware, it is possible to set this bit from userspace. One		real hardware, it is possible to set this bit from userspace. One
	should use TVL IFLA_CARRIER to do so.		should use TLV IFLA_CARRIER to do so.

	netif_carrier_ok() can be used to query that bit.		netif_carrier_ok() can be used to query that bit.

Documentation/virt/kvm/api.rst

+15 −15

MAINTAINERS

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7858,9 +7858,9 @@ S: Maintained
	F: drivers/input/touchscreen/goodix.c		F: drivers/input/touchscreen/goodix.c

	GOOGLE ETHERNET DRIVERS		GOOGLE ETHERNET DRIVERS
	M: Catherine Sullivan <csully@google.com>		M: Jeroen de Borst <jeroendb@google.com>
	R: Sagi Shahar <sagis@google.com>		R: Catherine Sullivan <csully@google.com>
	R: Jon Olson <jonolson@google.com>		R: David Awogbemila <awogbemila@google.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Supported
	F: Documentation/networking/device_drivers/ethernet/google/gve.rst		F: Documentation/networking/device_drivers/ethernet/google/gve.rst
	@@ -11327,6 +11327,12 @@ W: https://linuxtv.org
	T: git git://linuxtv.org/media_tree.git		T: git git://linuxtv.org/media_tree.git
	F: drivers/media/radio/radio-maxiradio*		F: drivers/media/radio/radio-maxiradio*

			MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
			R: Yasushi SHOJI <yashi@spacecubics.com>
			L: linux-can@vger.kernel.org
			S: Maintained
			F: drivers/net/can/usb/mcba_usb.c

	MCAN MMIO DEVICE DRIVER		MCAN MMIO DEVICE DRIVER
	M: Chandrasekar Ramakrishnan <rcsekar@samsung.com>		M: Chandrasekar Ramakrishnan <rcsekar@samsung.com>
	L: linux-can@vger.kernel.org		L: linux-can@vger.kernel.org
	@@ -15468,6 +15474,8 @@ M: Pan, Xinhui <Xinhui.Pan@amd.com>
	L: amd-gfx@lists.freedesktop.org		L: amd-gfx@lists.freedesktop.org
	S: Supported		S: Supported
	T: git https://gitlab.freedesktop.org/agd5f/linux.git		T: git https://gitlab.freedesktop.org/agd5f/linux.git
			B: https://gitlab.freedesktop.org/drm/amd/-/issues
			C: irc://irc.oftc.net/radeon
	F: drivers/gpu/drm/amd/		F: drivers/gpu/drm/amd/
	F: drivers/gpu/drm/radeon/		F: drivers/gpu/drm/radeon/
	F: include/uapi/drm/amdgpu_drm.h		F: include/uapi/drm/amdgpu_drm.h

Makefile

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	VERSION = 5		VERSION = 5
	PATCHLEVEL = 14		PATCHLEVEL = 14
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc3		EXTRAVERSION = -rc5
	NAME = Opossums on Parade		NAME = Opossums on Parade

	# DOCUMENTATION		# DOCUMENTATION
	@@ -546,7 +546,6 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
	PHONY += scripts_basic		PHONY += scripts_basic
	scripts_basic:		scripts_basic:
	$(Q)$(MAKE) $(build)=scripts/basic		$(Q)$(MAKE) $(build)=scripts/basic
	$(Q)rm -f .tmp_quiet_recordmcount

	PHONY += outputmakefile		PHONY += outputmakefile
	ifdef building_out_of_srctree		ifdef building_out_of_srctree
	@@ -1317,6 +1316,16 @@ PHONY += scripts_unifdef
	scripts_unifdef: scripts_basic		scripts_unifdef: scripts_basic
	$(Q)$(MAKE) $(build)=scripts scripts/unifdef		$(Q)$(MAKE) $(build)=scripts scripts/unifdef

			# ---------------------------------------------------------------------------
			# Install

			# Many distributions have the custom install script, /sbin/installkernel.
			# If DKMS is installed, 'make install' will eventually recuses back
			# to the this Makefile to build and install external modules.
			# Cancel sub_make_done so that options such as M=, V=, etc. are parsed.

			install: sub_make_done :=

	# ---------------------------------------------------------------------------		# ---------------------------------------------------------------------------
	# Tools		# Tools

Original line number	Original line	Diff line number	Diff line
	@@ -855,7 +855,7 @@ in-kernel irqchip (GIC), and for in-kernel irqchip can tell the GIC to
	use PPIs designated for specific cpus. The irq field is interpreted		use PPIs designated for specific cpus. The irq field is interpreted
	like this::		like this::

	bits: \| 31 ... 28 \| 27 ... 24 \| 23 ... 16 \| 15 ... 0 \|		bits: \| 31 ... 28 \| 27 ... 24 \| 23 ... 16 \| 15 ... 0 \|
	field: \| vcpu2_index \| irq_type \| vcpu_index \| irq_id \|		field: \| vcpu2_index \| irq_type \| vcpu_index \| irq_id \|

	The irq_type field has the following values:		The irq_type field has the following values:
	@@ -2149,10 +2149,10 @@ prior to calling the KVM_RUN ioctl.
	Errors:		Errors:

	====== ============================================================		====== ============================================================
	ENOENT no such register		ENOENT no such register
	EINVAL invalid register ID, or no such register or used with VMs in		EINVAL invalid register ID, or no such register or used with VMs in
	protected virtualization mode on s390		protected virtualization mode on s390
	EPERM (arm64) register access not allowed before vcpu finalization		EPERM (arm64) register access not allowed before vcpu finalization
	====== ============================================================		====== ============================================================

	(These error codes are indicative only: do not rely on a specific error		(These error codes are indicative only: do not rely on a specific error
	@@ -2590,10 +2590,10 @@ following id bit patterns::
	Errors include:		Errors include:

	======== ============================================================		======== ============================================================
	ENOENT no such register		ENOENT no such register
	EINVAL invalid register ID, or no such register or used with VMs in		EINVAL invalid register ID, or no such register or used with VMs in
	protected virtualization mode on s390		protected virtualization mode on s390
	EPERM (arm64) register access not allowed before vcpu finalization		EPERM (arm64) register access not allowed before vcpu finalization
	======== ============================================================		======== ============================================================

	(These error codes are indicative only: do not rely on a specific error		(These error codes are indicative only: do not rely on a specific error
	@@ -3112,13 +3112,13 @@ current state. "addr" is ignored.
	Errors:		Errors:

	====== =================================================================		====== =================================================================
	EINVAL the target is unknown, or the combination of features is invalid.		EINVAL the target is unknown, or the combination of features is invalid.
	ENOENT a features bit specified is unknown.		ENOENT a features bit specified is unknown.
	====== =================================================================		====== =================================================================

	This tells KVM what type of CPU to present to the guest, and what		This tells KVM what type of CPU to present to the guest, and what
	optional features it should have. This will cause a reset of the cpu		optional features it should have. This will cause a reset of the cpu