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

Commit 9bd7de51 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'master' into for-2.6.31 



Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parents e4b63636 6a44587e

Documentation/filesystems/tmpfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,4 +133,4 @@ RAM/SWAP in 10240 inodes and it is only accessible by root. 
Author:

   Christoph Rohland <cr@sap.com>, 1.12.01

Updated:

   Hugh Dickins <hugh@veritas.com>, 4 June 2007
 
   Hugh Dickins, 4 June 2007

Documentation/networking/ip-sysctl.txt

+12 −3
Original line number Diff line number Diff line
@@ -1266,13 +1266,22 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max 
sctp_wmem  - vector of 3 INTEGERs: min, default, max

	See tcp_wmem for a description.



UNDOCUMENTED:



/proc/sys/net/core/*

	dev_weight FIXME

dev_weight - INTEGER

	The maximum number of packets that kernel can handle on a NAPI

	interrupt, it's a Per-CPU variable.



	Default: 64



/proc/sys/net/unix/*

	max_dgram_qlen FIXME

max_dgram_qlen - INTEGER

	The maximum length of dgram socket receive queue



	Default: 10





UNDOCUMENTED:



/proc/sys/net/irda/*

	fast_poll_increase FIXME

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -5579,6 +5579,14 @@ M: ian@mnementh.co.uk 
S:	Maintained

F:	drivers/mmc/host/tmio_mmc.*



TMPFS (SHMEM FILESYSTEM)

P:	Hugh Dickins

M:	hugh.dickins@tiscali.co.uk

L:	linux-mm@kvack.org

S:	Maintained

F:	include/linux/shmem_fs.h

F:	mm/shmem.c



TPM DEVICE DRIVER

P:	Debora Velarde

M:	debora@linux.vnet.ibm.com

arch/arm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ config ARCH_EP93XX 
	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -976,10 +977,9 @@ config OABI_COMPAT 
	  UNPREDICTABLE (in fact it can be predicted that it won't work

	  at all). If in doubt say Y.



config ARCH_FLATMEM_HAS_HOLES

config ARCH_HAS_HOLES_MEMORYMODEL

	bool

	default y

	depends on FLATMEM

	default n



# Discontigmem is deprecated

config ARCH_DISCONTIGMEM_ENABLE

arch/arm/common/gic.c

+2 −2
Original line number Diff line number Diff line
@@ -253,9 +253,9 @@ void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base) 
}



#ifdef CONFIG_SMP

void gic_raise_softirq(cpumask_t cpumask, unsigned int irq)

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)

{

	unsigned long map = *cpus_addr(cpumask);

	unsigned long map = *cpus_addr(*mask);



	/* this always happens on GIC0 */

	writel(map << 16 | irq, gic_data[0].dist_base + GIC_DIST_SOFTINT);