Merge "Merge remote-tracking branch 'origin/tmp-6bf4ca7' into msm-kona" (c0e0ffe7) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Required properties:
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
		the Cadence GEM, or the generic form: "cdns,gem".
		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
		Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

+11 −1

Original line number	Diff line number	Diff line
		@@ -4510,7 +4510,8 @@ Do not enable KVM_FEATURE_PV_UNHALT if you disable HLT exits.
		Architectures: s390
		Parameters: none
		Returns: 0 on success, -EINVAL if hpage module parameter was not set
		or cmma is enabled
		or cmma is enabled, or the VM has the KVM_VM_S390_UCONTROL
		flag set

		With this capability the KVM support for memory backing with 1m pages
		through hugetlbfs can be enabled for a VM. After the capability is
		@@ -4521,6 +4522,15 @@ hpage module parameter is not set to 1, -EINVAL is returned.
		While it is generally possible to create a huge page backed VM without
		this capability, the VM will not be able to run.

		7.14 KVM_CAP_MSR_PLATFORM_INFO

		Architectures: x86
		Parameters: args[0] whether feature should be enabled or not

		With this capability, a guest may read the MSR_PLATFORM_INFO MSR. Otherwise,
		a #GP would be raised when the guest tries to access. Currently, this
		capability does not enable write permissions of this MSR for the guest.

		8. Other capabilities.
		----------------------

+12 −2

Original line number	Diff line number	Diff line
		@@ -12268,6 +12268,7 @@ F: Documentation/networking/rds.txt

		RDT - RESOURCE ALLOCATION
		M: Fenghua Yu <fenghua.yu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		L: linux-kernel@vger.kernel.org
		S: Supported
		F: arch/x86/kernel/cpu/intel_rdt*
		@@ -13457,9 +13458,8 @@ F: drivers/i2c/busses/i2c-synquacer.c
		F: Documentation/devicetree/bindings/i2c/i2c-synquacer.txt

		SOCIONEXT UNIPHIER SOUND DRIVER
		M: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Maintained
		S: Orphan
		F: sound/soc/uniphier/

		SOEKRIS NET48XX LED SUPPORT
		@@ -15921,6 +15921,7 @@ F: net/x25/
		X86 ARCHITECTURE (32-BIT AND 64-BIT)
		M: Thomas Gleixner <tglx@linutronix.de>
		M: Ingo Molnar <mingo@redhat.com>
		M: Borislav Petkov <bp@alien8.de>
		R: "H. Peter Anvin" <hpa@zytor.com>
		M: x86@kernel.org
		L: linux-kernel@vger.kernel.org
		@@ -15949,6 +15950,15 @@ M: Borislav Petkov <bp@alien8.de>
		S: Maintained
		F: arch/x86/kernel/cpu/microcode/*

		X86 MM
		M: Dave Hansen <dave.hansen@linux.intel.com>
		M: Andy Lutomirski <luto@kernel.org>
		M: Peter Zijlstra <peterz@infradead.org>
		L: linux-kernel@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm
		S: Maintained
		F: arch/x86/mm/

		X86 PLATFORM DRIVERS
		M: Darren Hart <dvhart@infradead.org>
		M: Andy Shevchenko <andy@infradead.org>

+2 −14

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

		# DOCUMENTATION
		@@ -299,19 +299,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
		KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
		export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

		# SUBARCH tells the usermode build what the underlying arch is. That is set
		# first, and if a usermode build is happening, the "ARCH=um" on the command
		# line overrides the setting of ARCH below. If a native build is happening,
		# then ARCH is assigned, getting whatever value it gets normally, and
		# SUBARCH is subsequently ignored.

		SUBARCH := $(shell uname -m \| sed -e s/i.86/x86/ -e s/x86_64/x86/ \
		-e s/sun4u/sparc64/ \
		-e s/arm.*/arm/ -e s/sa110/arm/ \
		-e s/s390x/s390/ -e s/parisc64/parisc/ \
		-e s/ppc./powerpc/ -e s/mips./mips/ \
		-e s/sh[234]./sh/ -e s/aarch64./arm64/ \
		-e s/riscv.*/riscv/)
		include scripts/subarch.include

		# Cross compiling and selecting different set of gcc/bin-utils
		# ---------------------------------------------------------------------------

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		};

		macb1: ethernet@f802c000 {
		compatible = "cdns,at91sam9260-macb", "cdns,macb";
		compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";
		reg = <0xf802c000 0x100>;
		interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
		pinctrl-names = "default";