Commit 9e41d959 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next

parents 77ecfe8d 8e0ee43b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3738,7 +3738,7 @@ S: 93149 Nittenau
S: Germany

N: Gertjan van Wingerde
E: gwingerde@home.nl
E: gwingerde@gmail.com
D: Ralink rt2x00 WLAN driver
D: Minix V2 file-system
D: Misc fixes
+12 −0
Original line number Diff line number Diff line
@@ -298,3 +298,15 @@ over a rather long period of time, but improvements are always welcome!

	Note that, rcu_assign_pointer() and rcu_dereference() relate to
	SRCU just as they do to other forms of RCU.

15.	The whole point of call_rcu(), synchronize_rcu(), and friends
	is to wait until all pre-existing readers have finished before
	carrying out some otherwise-destructive operation.  It is
	therefore critically important to -first- remove any path
	that readers can follow that could be affected by the
	destructive operation, and -only- -then- invoke call_rcu(),
	synchronize_rcu(), or friends.

	Because these primitives only wait for pre-existing readers,
	it is the caller's responsibility to guarantee safety to
	any subsequent readers.
+5 −4
Original line number Diff line number Diff line
@@ -373,10 +373,11 @@ Filesystem Resizing http://ext2resize.sourceforge.net/
Compression (*)		http://e2compr.sourceforge.net/

Implementations for:
Windows 95/98/NT/2000	http://uranus.it.swin.edu.au/~jn/linux/Explore2fs.htm
Windows 95 (*)		http://www.yipton.demon.co.uk/content.html#FSDEXT2
Windows 95/98/NT/2000	http://www.chrysocome.net/explore2fs
Windows 95 (*)		http://www.yipton.net/content.html#FSDEXT2
DOS client (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/
OS/2			http://perso.wanadoo.fr/matthieu.willm/ext2-os2/
RISC OS client		ftp://ftp.barnet.ac.uk/pub/acorn/armlinux/iscafs/
OS/2 (+)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/
RISC OS client		http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/IscaFS/

(*) no longer actively developed/supported (as of Apr 2001)
(+) no longer actively developed/supported (as of Mar 2009)
+2 −2
Original line number Diff line number Diff line
@@ -198,5 +198,5 @@ kernel source: <file:fs/ext3/>
programs: 	http://e2fsprogs.sourceforge.net/
		http://ext2resize.sourceforge.net

useful links:	http://www-106.ibm.com/developerworks/linux/library/l-fs7/
		http://www-106.ibm.com/developerworks/linux/library/l-fs8/
useful links:	http://www.ibm.com/developerworks/library/l-fs7.html
		http://www.ibm.com/developerworks/library/l-fs8.html
+7 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,13 @@ of problems on the network like duplicate address or bad checksums. Normally,
this should be enabled, but if the problem persists the messages can be
disabled.

netdev_budget
-------------

Maximum number of packets taken from all interfaces in one polling cycle (NAPI
poll). In one polling cycle interfaces which are registered to polling are
probed in a round-robin manner. The limit of packets in one such probe can be
set per-device via sysfs class/net/<device>/weight .

netdev_max_backlog
------------------
Loading