Merge 3.14-rc5 into char-misc-next (aa074c1c) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt

+10 −6

Original line number	Diff line number	Diff line
		* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX

		Required properties:
		- compatible : Should be "fsl,imx31-sdma", "fsl,imx31-to1-sdma",
		"fsl,imx31-to2-sdma", "fsl,imx35-sdma", "fsl,imx35-to1-sdma",
		"fsl,imx35-to2-sdma", "fsl,imx51-sdma", "fsl,imx53-sdma" or
		"fsl,imx6q-sdma". The -to variants should be preferred since they
		allow to determnine the correct ROM script addresses needed for
		the driver to work without additional firmware.
		- compatible : Should be one of
		"fsl,imx25-sdma"
		"fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"
		"fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"
		"fsl,imx51-sdma"
		"fsl,imx53-sdma"
		"fsl,imx6q-sdma"
		The -to variants should be preferred since they allow to determnine the
		correct ROM script addresses needed for the driver to work without additional
		firmware.
		- reg : Should contain SDMA registers location and length
		- interrupts : Should contain SDMA interrupt
		- #dma-cells : Must be <3>.

MAINTAINERS

+20 −5

Original line number	Diff line number	Diff line
		@@ -538,7 +538,7 @@ F: arch/alpha/
		ALTERA UART/JTAG UART SERIAL DRIVERS
		M: Tobias Klauser <tklauser@distanz.ch>
		L: linux-serial@vger.kernel.org
		L: nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)
		L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
		S: Maintained
		F: drivers/tty/serial/altera_uart.c
		F: drivers/tty/serial/altera_jtaguart.c
		@@ -2611,9 +2611,9 @@ DC395x SCSI driver
		M: Oliver Neukum <oliver@neukum.org>
		M: Ali Akcaagac <aliakc@web.de>
		M: Jamie Lenehan <lenehan@twibble.org>
		W: http://twibble.org/dist/dc395x/
		L: dc395x@twibble.org
		L: http://lists.twibble.org/mailman/listinfo/dc395x/
		W: http://twibble.org/dist/dc395x/
		W: http://lists.twibble.org/mailman/listinfo/dc395x/
		S: Maintained
		F: Documentation/scsi/dc395x.txt
		F: drivers/scsi/dc395x.*
		@@ -2848,12 +2848,22 @@ F: lib/kobj*
		DRM DRIVERS
		M: David Airlie <airlied@linux.ie>
		L: dri-devel@lists.freedesktop.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
		T: git git://people.freedesktop.org/~airlied/linux
		S: Maintained
		F: drivers/gpu/drm/
		F: include/drm/
		F: include/uapi/drm/

		RADEON DRM DRIVERS
		M: Alex Deucher <alexander.deucher@amd.com>
		M: Christian König <christian.koenig@amd.com>
		L: dri-devel@lists.freedesktop.org
		T: git git://people.freedesktop.org/~agd5f/linux
		S: Supported
		F: drivers/gpu/drm/radeon/
		F: include/drm/radeon*
		F: include/uapi/drm/radeon*

		INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
		M: Daniel Vetter <daniel.vetter@ffwll.ch>
		M: Jani Nikula <jani.nikula@linux.intel.com>
		@@ -5501,6 +5511,11 @@ W: http://www.kernel.org/doc/man-pages
		L: linux-man@vger.kernel.org
		S: Maintained

		MARVELL ARMADA DRM SUPPORT
		M: Russell King <rmk+kernel@arm.linux.org.uk>
		S: Maintained
		F: drivers/gpu/drm/armada/

		MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
		M: Mirko Lindner <mlindner@marvell.com>
		M: Stephen Hemminger <stephen@networkplumber.org>
		@@ -8449,8 +8464,8 @@ TARGET SUBSYSTEM
		M: Nicholas A. Bellinger <nab@linux-iscsi.org>
		L: linux-scsi@vger.kernel.org
		L: target-devel@vger.kernel.org
		L: http://groups.google.com/group/linux-iscsi-target-dev
		W: http://www.linux-iscsi.org
		W: http://groups.google.com/group/linux-iscsi-target-dev
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
		S: Supported
		F: drivers/target/

Makefile

+6 −4

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 14
		SUBLEVEL = 0
		EXTRAVERSION = -rc4
		EXTRAVERSION = -rc5
		NAME = Shuffling Zombie Juror

		# DOCUMENTATION
		@@ -605,10 +605,11 @@ endif
		ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
		stackp-flag := -fstack-protector
		ifeq ($(call cc-option, $(stackp-flag)),)
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
		-fstack-protector not supported by compiler))
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \
		-fstack-protector not supported by compiler)
		endif
		else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
		else
		ifdef CONFIG_CC_STACKPROTECTOR_STRONG
		stackp-flag := -fstack-protector-strong
		ifeq ($(call cc-option, $(stackp-flag)),)
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
		@@ -618,6 +619,7 @@ else
		# Force off for distro compilers that enable stack protector by default.
		stackp-flag := $(call cc-option, -fno-stack-protector)
		endif
		endif
		KBUILD_CFLAGS += $(stackp-flag)

		# This warning generated too much noise in a regular build.

arch/arm/kvm/arm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -878,7 +878,8 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
		unsigned long cmd,
		void *v)
		{
		if (cmd == CPU_PM_EXIT) {
		if (cmd == CPU_PM_EXIT &&
		__hyp_get_vectors() == hyp_default_vectors) {
		cpu_init_hyp_mode(NULL);
		return NOTIFY_OK;
		}

arch/arm/kvm/interrupts.S

+10 −1

Original line number	Diff line number	Diff line
		@@ -220,6 +220,10 @@ after_vfp_restore:
		* in Hyp mode (see init_hyp_mode in arch/arm/kvm/arm.c). Return values are
		* passed in r0 and r1.
		*
		* A function pointer with a value of 0xffffffff has a special meaning,
		* and is used to implement __hyp_get_vectors in the same way as in
		* arch/arm/kernel/hyp_stub.S.
		*
		* The calling convention follows the standard AAPCS:
		* r0 - r3: caller save
		* r12: caller save
		@@ -363,6 +367,11 @@ hyp_hvc:
		host_switch_to_hyp:
		pop {r0, r1, r2}

		/* Check for __hyp_get_vectors */
		cmp r0, #-1
		mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR
		beq 1f

		push {lr}
		mrs lr, SPSR
		push {lr}
		@@ -378,7 +387,7 @@ THUMB( orr lr, #1)
		pop {lr}
		msr SPSR_csxf, lr
		pop {lr}
		eret
		1: eret

		guest_trap:
		load_vcpu @ Load VCPU pointer to r0