Commit 9508534c authored by Alex Elder's avatar Alex Elder
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 



Resolved conflicts:
  fs/xfs/xfs_trans_priv.h:
    - deleted struct xfs_ail field xa_flags
    - kept field xa_log_flush in struct xfs_ail
  fs/xfs/xfs_trans_ail.c:
    - in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
      "flush_log = 1" with "ailp->xa_log_flush++"

Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parents 5a93a064 a84a79e4

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.

Documentation/networking/scaling.txt

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ applying a filter to each packet that assigns it to one of a small number 
of logical flows. Packets for each flow are steered to a separate receive

queue, which in turn can be processed by separate CPUs. This mechanism is

generally known as “Receive-side Scaling” (RSS). The goal of RSS and

the other scaling techniques to increase performance uniformly.

the other scaling techniques is to increase performance uniformly.

Multi-queue distribution can also be used for traffic prioritization, but

that is not the focus of these techniques.
@@ -186,10 +186,10 @@ are steered using plain RPS. Multiple table entries may point to the 
same CPU. Indeed, with many flows and few CPUs, it is very likely that

a single application thread handles flows with many different flow hashes.



rps_sock_table is a global flow table that contains the *desired* CPU for

flows: the CPU that is currently processing the flow in userspace. Each

table value is a CPU index that is updated during calls to recvmsg and

sendmsg (specifically, inet_recvmsg(), inet_sendmsg(), inet_sendpage()

rps_sock_flow_table is a global flow table that contains the *desired* CPU

for flows: the CPU that is currently processing the flow in userspace.

Each table value is a CPU index that is updated during calls to recvmsg

and sendmsg (specifically, inet_recvmsg(), inet_sendmsg(), inet_sendpage()

and tcp_splice_read()).



When the scheduler moves a thread to a new CPU while it has outstanding

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6366,10 +6366,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

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;



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE