Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus (ca89bc24) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/connector/ucon.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg)
	nlh->nlmsg_seq = seq++;		nlh->nlmsg_seq = seq++;
	nlh->nlmsg_pid = getpid();		nlh->nlmsg_pid = getpid();
	nlh->nlmsg_type = NLMSG_DONE;		nlh->nlmsg_type = NLMSG_DONE;
	nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));		nlh->nlmsg_len = size;
	nlh->nlmsg_flags = 0;		nlh->nlmsg_flags = 0;

	m = NLMSG_DATA(nlh);		m = NLMSG_DATA(nlh);

MAINTAINERS

+83 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1009,6 +1009,7 @@ ARM/Marvell Armada 370 and Armada XP SOC support
	M: Jason Cooper <jason@lakedaemon.net>		M: Jason Cooper <jason@lakedaemon.net>
	M: Andrew Lunn <andrew@lunn.ch>		M: Andrew Lunn <andrew@lunn.ch>
	M: Gregory Clement <gregory.clement@free-electrons.com>		M: Gregory Clement <gregory.clement@free-electrons.com>
			M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: arch/arm/mach-mvebu/		F: arch/arm/mach-mvebu/
	@@ -1016,6 +1017,7 @@ F: arch/arm/mach-mvebu/
	ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support		ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
	M: Jason Cooper <jason@lakedaemon.net>		M: Jason Cooper <jason@lakedaemon.net>
	M: Andrew Lunn <andrew@lunn.ch>		M: Andrew Lunn <andrew@lunn.ch>
			M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: arch/arm/mach-dove/		F: arch/arm/mach-dove/
	@@ -1148,6 +1150,13 @@ F: drivers/net/ethernet/i825xx/ether1*
	F: drivers/net/ethernet/seeq/ether3*		F: drivers/net/ethernet/seeq/ether3*
	F: drivers/scsi/arm/		F: drivers/scsi/arm/

			ARM/Rockchip SoC support
			M: Heiko Stuebner <heiko@sntech.de>
			L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			S: Maintained
			F: arch/arm/mach-rockchip/
			F: drivers//rockchip*

	ARM/SHARK MACHINE SUPPORT		ARM/SHARK MACHINE SUPPORT
	M: Alexander Schulz <alex@shark-linux.de>		M: Alexander Schulz <alex@shark-linux.de>
	W: http://www.shark-linux.de/shark.html		W: http://www.shark-linux.de/shark.html
	@@ -1791,6 +1800,7 @@ F: include/net/bluetooth/

	BONDING DRIVER		BONDING DRIVER
	M: Jay Vosburgh <fubar@us.ibm.com>		M: Jay Vosburgh <fubar@us.ibm.com>
			M: Veaceslav Falico <vfalico@redhat.com>
	M: Andy Gospodarek <andy@greyhouse.net>		M: Andy Gospodarek <andy@greyhouse.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://sourceforge.net/projects/bonding/		W: http://sourceforge.net/projects/bonding/
	@@ -2718,6 +2728,8 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
	DMA GENERIC OFFLOAD ENGINE SUBSYSTEM		DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
	M: Vinod Koul <vinod.koul@intel.com>		M: Vinod Koul <vinod.koul@intel.com>
	M: Dan Williams <dan.j.williams@intel.com>		M: Dan Williams <dan.j.williams@intel.com>
			L: dmaengine@vger.kernel.org
			Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
	S: Supported		S: Supported
	F: drivers/dma/		F: drivers/dma/
	F: include/linux/dma*		F: include/linux/dma*
	@@ -2821,7 +2833,7 @@ M: Terje Bergström <tbergstrom@nvidia.com>
	L: dri-devel@lists.freedesktop.org		L: dri-devel@lists.freedesktop.org
	L: linux-tegra@vger.kernel.org		L: linux-tegra@vger.kernel.org
	T: git git://anongit.freedesktop.org/tegra/linux.git		T: git git://anongit.freedesktop.org/tegra/linux.git
	S: Maintained		S: Supported
	F: drivers/gpu/host1x/		F: drivers/gpu/host1x/
	F: include/uapi/drm/tegra_drm.h		F: include/uapi/drm/tegra_drm.h
	F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt		F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
	@@ -4357,7 +4369,10 @@ F: arch/x86/kernel/microcode_intel.c

	INTEL I/OAT DMA DRIVER		INTEL I/OAT DMA DRIVER
	M: Dan Williams <dan.j.williams@intel.com>		M: Dan Williams <dan.j.williams@intel.com>
	S: Maintained		M: Dave Jiang <dave.jiang@intel.com>
			L: dmaengine@vger.kernel.org
			Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
			S: Supported
	F: drivers/dma/ioat*		F: drivers/dma/ioat*

	INTEL IOMMU (VT-d)		INTEL IOMMU (VT-d)
	@@ -7822,6 +7837,13 @@ F: Documentation/sound/alsa/soc/
	F: sound/soc/		F: sound/soc/
	F: include/sound/soc*		F: include/sound/soc*

			SOUND - DMAENGINE HELPERS
			M: Lars-Peter Clausen <lars@metafoo.de>
			S: Supported
			F: include/sound/dmaengine_pcm.h
			F: sound/core/pcm_dmaengine.c
			F: sound/soc/soc-generic-dmaengine-pcm.c

	SPARC + UltraSPARC (sparc/sparc64)		SPARC + UltraSPARC (sparc/sparc64)
	M: "David S. Miller" <davem@davemloft.net>		M: "David S. Miller" <davem@davemloft.net>
	L: sparclinux@vger.kernel.org		L: sparclinux@vger.kernel.org
	@@ -8294,14 +8316,72 @@ L: linux-media@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/media/rc/ttusbir.c		F: drivers/media/rc/ttusbir.c

	TEGRA SUPPORT		TEGRA ARCHITECTURE SUPPORT
	M: Stephen Warren <swarren@wwwdotorg.org>		M: Stephen Warren <swarren@wwwdotorg.org>
			M: Thierry Reding <thierry.reding@gmail.com>
	L: linux-tegra@vger.kernel.org		L: linux-tegra@vger.kernel.org
	Q: http://patchwork.ozlabs.org/project/linux-tegra/list/		Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
	S: Supported		S: Supported
	N: [^a-z]tegra		N: [^a-z]tegra

			TEGRA ASOC DRIVER
			M: Stephen Warren <swarren@wwwdotorg.org>
			S: Supported
			F: sound/soc/tegra/

			TEGRA CLOCK DRIVER
			M: Peter De Schrijver <pdeschrijver@nvidia.com>
			M: Prashant Gaikwad <pgaikwad@nvidia.com>
			S: Supported
			F: drivers/clk/tegra/

			TEGRA DMA DRIVER
			M: Laxman Dewangan <ldewangan@nvidia.com>
			S: Supported
			F: drivers/dma/tegra20-apb-dma.c

			TEGRA GPIO DRIVER
			M: Stephen Warren <swarren@wwwdotorg.org>
			S: Supported
			F: drivers/gpio/gpio-tegra.c

			TEGRA I2C DRIVER
			M: Laxman Dewangan <ldewangan@nvidia.com>
			S: Supported
			F: drivers/i2c/busses/i2c-tegra.c

			TEGRA IOMMU DRIVERS
			M: Hiroshi Doyu <hdoyu@nvidia.com>
			S: Supported
			F: drivers/iommu/tegra*

			TEGRA KBC DRIVER
			M: Rakesh Iyer <riyer@nvidia.com>
			M: Laxman Dewangan <ldewangan@nvidia.com>
			S: Supported
			F: drivers/input/keyboard/tegra-kbc.c

			TEGRA PINCTRL DRIVER
			M: Stephen Warren <swarren@wwwdotorg.org>
			S: Supported
			F: drivers/pinctrl/pinctrl-tegra*

			TEGRA PWM DRIVER
			M: Thierry Reding <thierry.reding@gmail.com>
			S: Supported
			F: drivers/pwm/pwm-tegra.c

			TEGRA SERIAL DRIVER
			M: Laxman Dewangan <ldewangan@nvidia.com>
			S: Supported
			F: drivers/tty/serial/serial-tegra.c

			TEGRA SPI DRIVER
			M: Laxman Dewangan <ldewangan@nvidia.com>
			S: Supported
			F: drivers/spi/spi-tegra*

	TEHUTI ETHERNET DRIVER		TEHUTI ETHERNET DRIVER
	M: Andy Gospodarek <andy@greyhouse.net>		M: Andy Gospodarek <andy@greyhouse.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 12		PATCHLEVEL = 12
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = One Giant Leap for Frogkind		NAME = One Giant Leap for Frogkind

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/boot/dts/integratorcp.dts

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9,11 +9,6 @@
	model = "ARM Integrator/CP";		model = "ARM Integrator/CP";
	compatible = "arm,integrator-cp";		compatible = "arm,integrator-cp";

	aliases {
	arm,timer-primary = &timer2;
	arm,timer-secondary = &timer1;
	};

	chosen {		chosen {
	bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";		bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
	};		};
	@@ -24,14 +19,18 @@
	};		};

	timer0: timer@13000000 {		timer0: timer@13000000 {
			/* TIMER0 runs @ 25MHz */
	compatible = "arm,integrator-cp-timer";		compatible = "arm,integrator-cp-timer";
			status = "disabled";
	};		};

	timer1: timer@13000100 {		timer1: timer@13000100 {
			/* TIMER1 runs @ 1MHz */
	compatible = "arm,integrator-cp-timer";		compatible = "arm,integrator-cp-timer";
	};		};

	timer2: timer@13000200 {		timer2: timer@13000200 {
			/* TIMER2 runs @ 1MHz */
	compatible = "arm,integrator-cp-timer";		compatible = "arm,integrator-cp-timer";
	};		};

arch/arm/net/bpf_jit_32.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -930,4 +930,5 @@ void bpf_jit_free(struct sk_filter *fp)
	{		{
	if (fp->bpf_func != sk_run_filter)		if (fp->bpf_func != sk_run_filter)
	module_free(NULL, fp->bpf_func);		module_free(NULL, fp->bpf_func);
			kfree(fp);
	}		}