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

Commit 1805b2f0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

parents 78d81d15 f42af6c4

Documentation/kernel-parameters.txt

+4 −3
Original line number Diff line number Diff line
@@ -2706,10 +2706,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			functions are at fixed addresses, they make nice

			targets for exploits that can control RIP.



			emulate     [default] Vsyscalls turn into traps and are

			            emulated reasonably safely.

			emulate     Vsyscalls turn into traps and are emulated

			            reasonably safely.



			native      Vsyscalls are native syscall instructions.

			native      [default] Vsyscalls are native syscall

			            instructions.

			            This is a little bit faster than trapping

			            and makes a few dynamic recompilers work

			            better than they would in emulation mode.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2468,7 +2468,7 @@ S: Supported 
F:	drivers/infiniband/hw/ehca/



EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER

M:	Breno Leitao <leitao@linux.vnet.ibm.com>

M:	Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/ibm/ehea/
@@ -6374,10 +6374,10 @@ F: net/ipv4/tcp_lp.c 


TEGRA SUPPORT

M:	Colin Cross <ccross@android.com>

M:	Erik Gilling <konkers@android.com>

M:	Olof Johansson <olof@lixom.net>

M:	Stephen Warren <swarren@nvidia.com>

L:	linux-tegra@vger.kernel.org

T:	git git://android.git.kernel.org/kernel/tegra.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git

S:	Supported

F:	arch/arm/mach-tegra

Makefile

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

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc9

EXTRAVERSION = -rc10

NAME = "Divemaster Edition"



# *DOCUMENTATION*

arch/arm/common/vic.c

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ static void __init vic_disable(void __iomem *base) 
	writel(0, base + VIC_INT_SELECT);

	writel(0, base + VIC_INT_ENABLE);

	writel(~0, base + VIC_INT_ENABLE_CLEAR);

	writel(0, base + VIC_IRQ_STATUS);

	writel(0, base + VIC_ITCR);

	writel(~0, base + VIC_INT_SOFT_CLEAR);

}

arch/arm/include/asm/localtimer.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef __ASM_ARM_LOCALTIMER_H

#define __ASM_ARM_LOCALTIMER_H



#include <linux/errno.h>



struct clock_event_device;



/*