Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (68aaf445) · Commits · EulixOS / Software / Kernel

Documentation/PCI/index.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem
		:numbered:

		pci
		picebus-howto
		pciebus-howto
		pci-iov-howto
		msi-howto
		acpi-info

Documentation/PCI/picebus-howto.rst→Documentation/PCI/pciebus-howto.rst

+0 −0

File moved.

View file

Documentation/admin-guide/kernel-parameters.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -4090,6 +4090,13 @@
		Run specified binary instead of /init from the ramdisk,
		used for early userspace startup. See initrd.

		rdrand= [X86]
		force - Override the decision by the kernel to hide the
		advertisement of RDRAND support (this affects
		certain AMD processors because of buggy BIOS
		support, specifically around the suspend/resume
		path).

		rdt= [HW,X86,RDT]
		Turn on/off individual RDT features. List is:
		cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+20 −10

Original line number	Diff line number	Diff line
		* ARC-HS Interrupt Distribution Unit

		This optional 2nd level interrupt controller can be used in SMP configurations for
		dynamic IRQ routing, load balancing of common/external IRQs towards core intc.
		This optional 2nd level interrupt controller can be used in SMP configurations
		for dynamic IRQ routing, load balancing of common/external IRQs towards core
		intc.

		Properties:

		- compatible: "snps,archs-idu-intc"
		- interrupt-controller: This is an interrupt controller.
		- #interrupt-cells: Must be <1>.

		Value of the cell specifies the "common" IRQ from peripheral to IDU. Number N
		of the particular interrupt line of IDU corresponds to the line N+24 of the
		core interrupt controller.

		intc accessed via the special ARC AUX register interface, hence "reg" property
		is not specified.
		- #interrupt-cells: Must be <1> or <2>.

		Value of the first cell specifies the "common" IRQ from peripheral to IDU.
		Number N of the particular interrupt line of IDU corresponds to the line N+24
		of the core interrupt controller.

		The (optional) second cell specifies any of the following flags:
		- bits[3:0] trigger type and level flags
		1 = low-to-high edge triggered
		2 = NOT SUPPORTED (high-to-low edge triggered)
		4 = active high level-sensitive <<< DEFAULT
		8 = NOT SUPPORTED (active low level-sensitive)
		When no second cell is specified, the interrupt is assumed to be level
		sensitive.

		The interrupt controller is accessed via the special ARC AUX register
		interface, hence "reg" property is not specified.

		Example:
		core_intc: core-interrupt-controller {

MAINTAINERS

+14 −17

Original line number	Diff line number	Diff line
		@@ -8468,11 +8468,6 @@ S: Maintained
		F: fs/io_uring.c
		F: include/uapi/linux/io_uring.h

		IP MASQUERADING
		M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
		S: Maintained
		F: net/ipv4/netfilter/ipt_MASQUERADE.c

		IPMI SUBSYSTEM
		M: Corey Minyard <minyard@acm.org>
		L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
		@@ -8846,14 +8841,6 @@ F: virt/kvm/*
		F: tools/kvm/
		F: tools/testing/selftests/kvm/

		KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
		M: Joerg Roedel <joro@8bytes.org>
		L: kvm@vger.kernel.org
		W: http://www.linux-kvm.org/
		S: Maintained
		F: arch/x86/include/asm/svm.h
		F: arch/x86/kvm/svm.c

		KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
		M: Marc Zyngier <maz@kernel.org>
		R: James Morse <james.morse@arm.com>
		@@ -8896,7 +8883,7 @@ M: Christian Borntraeger <borntraeger@de.ibm.com>
		M: Janosch Frank <frankja@linux.ibm.com>
		R: David Hildenbrand <david@redhat.com>
		R: Cornelia Huck <cohuck@redhat.com>
		L: linux-s390@vger.kernel.org
		L: kvm@vger.kernel.org
		W: http://www.ibm.com/developerworks/linux/linux390/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
		S: Supported
		@@ -8911,6 +8898,11 @@ F: tools/testing/selftests/kvm/*/s390x/
		KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
		M: Paolo Bonzini <pbonzini@redhat.com>
		M: Radim Krčmář <rkrcmar@redhat.com>
		R: Sean Christopherson <sean.j.christopherson@intel.com>
		R: Vitaly Kuznetsov <vkuznets@redhat.com>
		R: Wanpeng Li <wanpengli@tencent.com>
		R: Jim Mattson <jmattson@google.com>
		R: Joerg Roedel <joro@8bytes.org>
		L: kvm@vger.kernel.org
		W: http://www.linux-kvm.org
		T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
		@@ -8918,8 +8910,12 @@ S: Supported
		F: arch/x86/kvm/
		F: arch/x86/kvm/*/
		F: arch/x86/include/uapi/asm/kvm*
		F: arch/x86/include/uapi/asm/vmx.h
		F: arch/x86/include/uapi/asm/svm.h
		F: arch/x86/include/asm/kvm*
		F: arch/x86/include/asm/pvclock-abi.h
		F: arch/x86/include/asm/svm.h
		F: arch/x86/include/asm/vmx.h
		F: arch/x86/kernel/kvm.c
		F: arch/x86/kernel/kvmclock.c

		@@ -11099,7 +11095,7 @@ NET_FAILOVER MODULE
		M: Sridhar Samudrala <sridhar.samudrala@intel.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: driver/net/net_failover.c
		F: drivers/net/net_failover.c
		F: include/net/net_failover.h
		F: Documentation/networking/net_failover.rst

		@@ -14491,6 +14487,7 @@ F: drivers/net/phy/phylink.c
		F: drivers/net/phy/sfp*
		F: include/linux/phylink.h
		F: include/linux/sfp.h
		K: phylink

		SGI GRU DRIVER
		M: Dimitri Sivanich <sivanich@sgi.com>
		@@ -14896,9 +14893,9 @@ F: include/linux/arm_sdei.h
		F: include/uapi/linux/arm_sdei.h

		SOFTWARE RAID (Multiple Disks) SUPPORT
		M: Shaohua Li <shli@kernel.org>
		M: Song Liu <song@kernel.org>
		L: linux-raid@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
		S: Supported
		F: drivers/md/Makefile
		F: drivers/md/Kconfig