Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16477753 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.12' into x86/cpu, to refresh the branch before queueing up more changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 09dc68d9 5e01dc7b

MAINTAINERS

+78 −53
Original line number 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:	Andrew Lunn <andrew@lunn.ch>

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)

S:	Maintained

F:	arch/arm/mach-mvebu/
@@ -1016,6 +1017,7 @@ F: arch/arm/mach-mvebu/ 
ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-dove/
@@ -1148,6 +1150,13 @@ F: drivers/net/ethernet/i825xx/ether1* 
F:	drivers/net/ethernet/seeq/ether3*

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

M:	Alexander Schulz <alex@shark-linux.de>

W:	http://www.shark-linux.de/shark.html
@@ -2719,6 +2728,8 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git 
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@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

F:	drivers/dma/

F:	include/linux/dma*
@@ -2822,7 +2833,7 @@ M: Terje Bergström <tbergstrom@nvidia.com> 
L:	dri-devel@lists.freedesktop.org

L:	linux-tegra@vger.kernel.org

T:	git git://anongit.freedesktop.org/tegra/linux.git

S:	Maintained

S:	Supported

F:	drivers/gpu/host1x/

F:	include/uapi/drm/tegra_drm.h

F:	Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -4358,7 +4369,10 @@ F: arch/x86/kernel/microcode_intel.c 


INTEL I/OAT DMA DRIVER

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*



INTEL IOMMU (VT-d)
@@ -8302,14 +8316,72 @@ L: linux-media@vger.kernel.org 
S:	Maintained

F:	drivers/media/rc/ttusbir.c



TEGRA SUPPORT

TEGRA ARCHITECTURE SUPPORT

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Thierry Reding <thierry.reding@gmail.com>

L:	linux-tegra@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git

S:	Supported

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

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org
@@ -8845,61 +8917,14 @@ W: http://pegasus2.sourceforge.net/ 
S:	Maintained

F:	drivers/net/usb/rtl8150.c



USB SERIAL BELKIN F5U103 DRIVER

M:	William Greathouse <wgreathouse@smva.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/belkin_sa.*



USB SERIAL CYPRESS M8 DRIVER

M:	Lonnie Mendez <dignome@gmail.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

W:	http://geocities.com/i0xox0i

W:	http://firstlight.net/cvs

F:	drivers/usb/serial/cypress_m8.*



USB SERIAL CYBERJACK DRIVER

M:	Matthias Bruestle and Harald Welte <support@reiner-sct.com>

W:	http://www.reiner-sct.de/support/treiber_cyberjack.php

S:	Maintained

F:	drivers/usb/serial/cyberjack.c



USB SERIAL DIGI ACCELEPORT DRIVER

M:	Peter Berger <pberger@brimson.com>

M:	Al Borchers <alborchers@steinerpoint.com>

USB SERIAL SUBSYSTEM

M:	Johan Hovold <jhovold@gmail.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/digi_acceleport.c



USB SERIAL DRIVER

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

S:	Supported

F:	Documentation/usb/usb-serial.txt

F:	drivers/usb/serial/generic.c

F:	drivers/usb/serial/usb-serial.c

F:	drivers/usb/serial/

F:	include/linux/usb/serial.h



USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER

M:	Gary Brubaker <xavyer@ix.netcom.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/empeg.c



USB SERIAL KEYSPAN DRIVER

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/*keyspan*



USB SERIAL WHITEHEAT DRIVER

M:	Support Department <support@connecttech.com>

L:	linux-usb@vger.kernel.org

W:	http://www.connecttech.com

S:	Supported

F:	drivers/usb/serial/whiteheat*



USB SMSC75XX ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION =

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arc/mm/fault.c

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/pgalloc.h>

#include <asm/mmu.h>



static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address)

static int handle_vmalloc_fault(unsigned long address)

{

	/*

	 * Synchronize this task's top level page-table
@@ -27,7 +27,7 @@ static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address) 
	pud_t *pud, *pud_k;

	pmd_t *pmd, *pmd_k;



	pgd = pgd_offset_fast(mm, address);

	pgd = pgd_offset_fast(current->active_mm, address);

	pgd_k = pgd_offset_k(address);



	if (!pgd_present(*pgd_k))
@@ -72,7 +72,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address) 
	 * nothing more.

	 */

	if (address >= VMALLOC_START && address <= VMALLOC_END) {

		ret = handle_vmalloc_fault(mm, address);

		ret = handle_vmalloc_fault(address);

		if (unlikely(ret))

			goto bad_area_nosemaphore;

		else

arch/arm/boot/dts/integratorcp.dts

+4 −5
Original line number Diff line number Diff line
@@ -9,11 +9,6 @@ 
	model = "ARM Integrator/CP";

	compatible = "arm,integrator-cp";



	aliases {

		arm,timer-primary = &timer2;

		arm,timer-secondary = &timer1;

	};



	chosen {

		bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";

	};
@@ -24,14 +19,18 @@ 
	};



	timer0: timer@13000000 {

		/* TIMER0 runs @ 25MHz */

		compatible = "arm,integrator-cp-timer";

		status = "disabled";

	};



	timer1: timer@13000100 {

		/* TIMER1 runs @ 1MHz */

		compatible = "arm,integrator-cp-timer";

	};



	timer2: timer@13000200 {

		/* TIMER2 runs @ 1MHz */

		compatible = "arm,integrator-cp-timer";

	};

arch/mips/kernel/perf_event_mipsxx.c

+2 −2
Original line number Diff line number Diff line
@@ -971,11 +971,11 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map 
[C(LL)] = {

	[C(OP_READ)] = {

		[C(RESULT_ACCESS)]	= { 0x1c, CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN | CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN, P },

	},

	[C(OP_WRITE)] = {

		[C(RESULT_ACCESS)]	= { 0x1c, CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN | CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN, P },

	},

},

[C(ITLB)] = {