Merge branch 'linus' into locking/core, to pick up fixes (6f387515) · Commits · e / devices / android_kernel_xiaomi_nabu

CREDITS

+4 −4

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		Linus
		----------

		M: Matt Mackal
		N: Matt Mackal
		E: mpm@selenic.com
		D: SLOB slab allocator

		@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel

		N: Andi Kleen
		E: andi@firstfloor.org
		U: http://www.halobates.de
		W: http://www.halobates.de
		D: network, x86, NUMA, various hacks
		S: Schwalbenstr. 96
		S: 85551 Ottobrunn
		@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver
		D: Synopsys Designware PCI host bridge driver

		N: Gabor Kuti
		M: seasons@falcon.sch.bme.hu
		M: seasons@makosteszta.sote.hu
		E: seasons@falcon.sch.bme.hu
		E: seasons@makosteszta.sote.hu
		D: Original author of software suspend

		N: Jaroslav Kysela

Documentation/devicetree/bindings/net/ethernet.txt

+20 −4

Original line number	Diff line number	Diff line
		@@ -9,10 +9,26 @@ The following properties are common to the Ethernet controllers:
		- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
		- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
		the maximum frame size (there's contradiction in ePAPR).
		- phy-mode: string, operation mode of the PHY interface; supported values are
		"mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id",
		"rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii", "trgmii"; this is now a
		de-facto standard property;
		- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
		standard property; supported values are:
		* "mii"
		* "gmii"
		* "sgmii"
		* "qsgmii"
		* "tbi"
		* "rev-mii"
		* "rmii"
		* "rgmii" (RX and TX delays are added by the MAC when required)
		* "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the
		MAC should not add the RX or TX delays in this case)
		* "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
		should not add an RX delay in this case)
		* "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC
		should not add an TX delay in this case)
		* "rtbi"
		* "smii"
		* "xgmii"
		* "trgmii"
		- phy-connection-type: the same as "phy-mode" property but described in ePAPR;
		- phy-handle: phandle, specifies a reference to a node representing a PHY
		device; this property is described in ePAPR and so preferred;

Documentation/networking/nf_conntrack-sysctl.txt

+5 −2

Original line number	Diff line number	Diff line
		@@ -62,10 +62,13 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
		protocols.

		nf_conntrack_helper - BOOLEAN
		0 - disabled
		not 0 - enabled (default)
		0 - disabled (default)
		not 0 - enabled

		Enable automatic conntrack helper assignment.
		If disabled it is required to set up iptables rules to assign
		helpers to connections. See the CT target description in the
		iptables-extensions(8) man page for further information.

		nf_conntrack_icmp_timeout - INTEGER (seconds)
		default 30

MAINTAINERS

+14 −9

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ Descriptions of section entries:
		Q: Patchwork web based patch tracking system site
		T: SCM tree type and location.
		Type is one of: git, hg, quilt, stgit, topgit
		B: Bug tracking system location.
		S: Status, one of the following:
		Supported: Someone is actually paid to look after this.
		Maintained: Someone actually looks after it.
		@@ -281,6 +282,7 @@ L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		Q: https://patchwork.kernel.org/project/linux-acpi/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/
		F: drivers/pnp/pnpacpi/
		@@ -304,6 +306,8 @@ W: https://acpica.org/
		W: https://github.com/acpica/acpica/
		Q: https://patchwork.kernel.org/project/linux-acpi/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		B: https://bugs.acpica.org
		S: Supported
		F: drivers/acpi/acpica/
		F: include/acpi/
		@@ -313,6 +317,7 @@ ACPI FAN DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/fan.c

		@@ -328,6 +333,7 @@ ACPI THERMAL DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/thermal

		@@ -335,6 +341,7 @@ ACPI VIDEO DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/acpi_video.c

		@@ -5663,6 +5670,7 @@ HIBERNATION (aka Software Suspend, aka swsusp)
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Pavel Machek <pavel@ucw.cz>
		L: linux-pm@vger.kernel.org
		B: https://bugzilla.kernel.org
		S: Supported
		F: arch/x86/power/
		F: drivers/base/power/
		@@ -9249,11 +9257,12 @@ S: Maintained
		F: drivers/pci/host/layerscape

		PCI DRIVER FOR IMX6
		M: Richard Zhu <Richard.Zhu@freescale.com>
		M: Richard Zhu <hongxing.zhu@nxp.com>
		M: Lucas Stach <l.stach@pengutronix.de>
		L: linux-pci@vger.kernel.org
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
		F: drivers/pci/host/imx6

		PCI DRIVER FOR TI KEYSTONE
		@@ -9312,17 +9321,11 @@ F: drivers/pci/host/pci-exynos.c

		PCI DRIVER FOR SYNOPSIS DESIGNWARE
		M: Jingoo Han <jingoohan1@gmail.com>
		M: Pratyush Anand <pratyush.anand@gmail.com>
		L: linux-pci@vger.kernel.org
		S: Maintained
		F: drivers/pci/host/designware

		PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
		M: Jose Abreu <Jose.Abreu@synopsys.com>
		M: Joao Pinto <Joao.Pinto@synopsys.com>
		L: linux-pci@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/pci/designware-pcie.txt
		F: drivers/pci/host/pcie-designware-plat.c
		F: drivers/pci/host/designware

		PCI DRIVER FOR GENERIC OF HOSTS
		M: Will Deacon <will.deacon@arm.com>
		@@ -9624,6 +9627,7 @@ POWER MANAGEMENT CORE
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		L: linux-pm@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/base/power/
		F: include/linux/pm.h
		@@ -11613,6 +11617,7 @@ M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Len Brown <len.brown@intel.com>
		M: Pavel Machek <pavel@ucw.cz>
		L: linux-pm@vger.kernel.org
		B: https://bugzilla.kernel.org
		S: Supported
		F: Documentation/power/
		F: arch/x86/kernel/acpi/

Makefile

+9 −4

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc8
		NAME = Psychotic Stoned Sheep

		# DOCUMENTATION
		@@ -607,6 +607,13 @@ else
		include/config/auto.conf: ;
		endif # $(dot-config)

		# For the kernel to actually contain only the needed exported symbols,
		# we have to build modules as well to determine what those symbols are.
		# (this can be evaluated only once include/config/auto.conf has been included)
		ifdef CONFIG_TRIM_UNUSED_KSYMS
		KBUILD_MODULES := 1
		endif

		# The all: target is the default when no target is given on the
		# command line.
		# This allow a user to issue only 'make' to build a kernel including modules
		@@ -944,7 +951,7 @@ ifdef CONFIG_GDB_SCRIPTS
		endif
		ifdef CONFIG_TRIM_UNUSED_KSYMS
		$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
		"$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"
		"$(MAKE) -f $(srctree)/Makefile vmlinux"
		endif

		# standalone target for easier testing
		@@ -1019,8 +1026,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
		prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
		include/config/auto.conf
		$(cmd_crmodverdir)
		$(Q)test -e include/generated/autoksyms.h \|\| \
		touch include/generated/autoksyms.h

		archprepare: archheaders archscripts prepare1 scripts_basic