Merge 4.19-rc6 into tty-next (669c5d8d) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1

Original line number	Diff line number	Diff line
		Device-Tree bindings for input/gpio_keys.c keyboard driver
		Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver

		Required properties:
		- compatible = "gpio-keys";

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.

Documentation/media/uapi/dvb/video_function_calls.rst

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,4 +33,3 @@ Video Function Calls
		video-clear-buffer
		video-set-streamtype
		video-set-format
		video-set-attributes

Documentation/virtual/kvm/api.txt

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

MAINTAINERS

+26 −10

Original line number	Diff line number	Diff line
		@@ -9732,13 +9732,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
		S: Maintained
		F: drivers/media/dvb-frontends/mn88473*

		PCI DRIVER FOR MOBIVEIL PCIE IP
		M: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
		F: drivers/pci/controller/pcie-mobiveil.c

		MODULE SUPPORT
		M: Jessica Yu <jeyu@kernel.org>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
		@@ -10965,7 +10958,7 @@ M: Willy Tarreau <willy@haproxy.com>
		M: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
		S: Odd Fixes
		F: Documentation/auxdisplay/lcd-panel-cgram.txt
		F: drivers/misc/panel.c
		F: drivers/auxdisplay/panel.c

		PARALLEL PORT SUBSYSTEM
		M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
		@@ -11153,6 +11146,13 @@ F: include/uapi/linux/switchtec_ioctl.h
		F: include/linux/switchtec.h
		F: drivers/ntb/hw/mscc/

		PCI DRIVER FOR MOBIVEIL PCIE IP
		M: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
		F: drivers/pci/controller/pcie-mobiveil.c

		PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
		M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
		M: Jason Cooper <jason@lakedaemon.net>
		@@ -11219,8 +11219,14 @@ F: tools/pci/

		PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
		M: Russell Currey <ruscur@russell.cc>
		M: Sam Bobroff <sbobroff@linux.ibm.com>
		M: Oliver O'Halloran <oohall@gmail.com>
		L: linuxppc-dev@lists.ozlabs.org
		S: Supported
		F: Documentation/PCI/pci-error-recovery.txt
		F: drivers/pci/pcie/aer.c
		F: drivers/pci/pcie/dpc.c
		F: drivers/pci/pcie/err.c
		F: Documentation/powerpc/eeh-pci-error-recovery.txt
		F: arch/powerpc/kernel/eeh*.c
		F: arch/powerpc/platforms//eeh.c
		@@ -12276,6 +12282,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*
		@@ -13465,9 +13472,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
		@@ -15929,6 +15935,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
		@@ -15957,6 +15964,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>