Merge 4.4-rc5 into usb-next as we want those fixes here for testing (252ca494) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,10 @@ Required properties:
		0 = active high
		1 = active low

		Optional properties:
		- little-endian : GPIO registers are used as little endian. If not
		present registers are used as big endian by default.

		Example:

		gpio0: gpio@1100 {

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,11 @@ Required properties:
		- phy-mode: See ethernet.txt file in the same directory
		- clocks: a pointer to the reference clock for this device.

		Optional properties:
		- tx-csum-limit: maximum mtu supported by port that allow TX checksum.
		Value is presented in bytes. If not used, by default 1600B is set for
		"marvell,armada-370-neta" and 9800B for others.

		Example:

		ethernet@d0070000 {
		@@ -15,6 +20,7 @@ ethernet@d0070000 {
		reg = <0xd0070000 0x2500>;
		interrupts = <8>;
		clocks = <&gate_clk 4>;
		tx-csum-limit = <9800>
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";

MAINTAINERS

+9 −6

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		S: Supported
		F: drivers/acpi/video.c
		F: drivers/acpi/acpi_video.c

		ACPI WMI DRIVER
		L: platform-driver-x86@vger.kernel.org
		@@ -1847,7 +1847,7 @@ S: Supported
		F: drivers/net/wireless/ath/ath6kl/

		WILOCITY WIL6210 WIRELESS DRIVER
		M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
		M: Maya Erez <qca_merez@qca.qualcomm.com>
		L: linux-wireless@vger.kernel.org
		L: wil6210@qca.qualcomm.com
		S: Supported
		@@ -2975,6 +2975,7 @@ F: kernel/cpuset.c
		CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
		M: Johannes Weiner <hannes@cmpxchg.org>
		M: Michal Hocko <mhocko@kernel.org>
		M: Vladimir Davydov <vdavydov@virtuozzo.com>
		L: cgroups@vger.kernel.org
		L: linux-mm@kvack.org
		S: Maintained
		@@ -8286,7 +8287,7 @@ F: include/linux/delayacct.h
		F: kernel/delayacct.c

		PERFORMANCE EVENTS SUBSYSTEM
		M: Peter Zijlstra <a.p.zijlstra@chello.nl>
		M: Peter Zijlstra <peterz@infradead.org>
		M: Ingo Molnar <mingo@redhat.com>
		M: Arnaldo Carvalho de Melo <acme@kernel.org>
		L: linux-kernel@vger.kernel.org
		@@ -9427,8 +9428,10 @@ F: include/scsi/sg.h

		SCSI SUBSYSTEM
		M: "James E.J. Bottomley" <JBottomley@odin.com>
		L: linux-scsi@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
		M: "Martin K. Petersen" <martin.petersen@oracle.com>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
		L: linux-scsi@vger.kernel.org
		S: Maintained
		F: drivers/scsi/
		F: include/scsi/
		@@ -10903,9 +10906,9 @@ S: Maintained
		F: drivers/media/tuners/tua9001*

		TULIP NETWORK DRIVERS
		M: Grant Grundler <grundler@parisc-linux.org>
		L: netdev@vger.kernel.org
		S: Maintained
		L: linux-parisc@vger.kernel.org
		S: Orphan
		F: drivers/net/ethernet/dec/tulip/

		TUN/TAP driver

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 0
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc5
		NAME = Blurry Fish Butt

		# DOCUMENTATION

arch/arm/boot/dts/am4372.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@
		reg = <0x48240200 0x100>;
		interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-parent = <&gic>;
		clocks = <&dpll_mpu_m2_ck>;
		clocks = <&mpu_periphclk>;
		};

		local_timer: timer@48240600 {
		@@ -82,7 +82,7 @@
		reg = <0x48240600 0x100>;
		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-parent = <&gic>;
		clocks = <&dpll_mpu_m2_ck>;
		clocks = <&mpu_periphclk>;
		};

		l2-cache-controller@48242000 {