Merge branch 'pxa/devel' into next/devel2 (b8bc8397) · Commits · e / devices / android_kernel_fairphone_FP4

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/ip-sysctl.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -1042,7 +1042,7 @@ conf/interface/*:
		The functional behaviour for certain settings is different
		depending on whether local forwarding is enabled or not.

		accept_ra - BOOLEAN
		accept_ra - INTEGER
		Accept Router Advertisements; autoconfigure using them.

		Possible values are:
		@@ -1106,7 +1106,7 @@ dad_transmits - INTEGER
		The amount of Duplicate Address Detection probes to send.
		Default: 1

		forwarding - BOOLEAN
		forwarding - INTEGER
		Configure interface-specific Host/Router behaviour.

		Note: It is recommended to have the same setting on all

Documentation/networking/scaling.txt

+6 −6

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
		@@ -243,7 +243,7 @@ configured. The number of entries in the global flow table is set through:

		The number of entries in the per-queue flow table are set through:

		/sys/class/net/<dev>/queues/tx-<n>/rps_flow_cnt
		/sys/class/net/<dev>/queues/rx-<n>/rps_flow_cnt

		== Suggested Configuration

MAINTAINERS

+4 −5

Original line number	Diff line number	Diff line
		@@ -2460,7 +2460,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/ehea/
		@@ -3313,7 +3313,7 @@ M: David Woodhouse <dwmw2@infradead.org>
		L: iommu@lists.linux-foundation.org
		T: git git://git.infradead.org/iommu-2.6.git
		S: Supported
		F: drivers/pci/intel-iommu.c
		F: drivers/iommu/intel-iommu.c
		F: include/linux/intel-iommu.h

		INTEL IOP-ADMA DMA DRIVER
		@@ -6366,15 +6366,14 @@ 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

		TEHUTI ETHERNET DRIVER
		M: Alexander Indenbaum <baum@tehutinetworks.net>
		M: Andy Gospodarek <andy@greyhouse.net>
		L: netdev@vger.kernel.org
		S: Supported

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 1
		SUBLEVEL = 0
		EXTRAVERSION = -rc8
		EXTRAVERSION =
		NAME = "Divemaster Edition"

		# DOCUMENTATION