---

yaml
---
r: 103228
b: refs/heads/master
c: 1087f4f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32cb5b4e035e3d7b52f1e9de87920645a00e5234
+refs/heads/master: 1087f4f4af302e6e2fa40dd741f306444d90bece

trunk/Documentation/feature-removal-schedule.txt

@@ -312,15 +312,3 @@ When:	2.6.26
 Why:	Implementation became generic; users should now include
 	linux/semaphore.h instead.
 Who:	Matthew Wilcox <willy@linux.intel.com>
-
----------------------------
-
-What:	SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,
-	SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD
-When: 	June 2009
-Why:    A newer version of the options have been introduced in 2005 that
-	removes the limitions of the old API.  The sctp library has been
-        converted to use these new options at the same time.  Any user
-	space app that directly uses the old options should convert to using
-	the new options.
-Who:	Vlad Yasevich <vladislav.yasevich@hp.com>

trunk/Documentation/networking/ip-sysctl.txt

@@ -548,9 +548,8 @@ icmp_echo_ignore_broadcasts - BOOLEAN
 icmp_ratelimit - INTEGER
 	Limit the maximal rates for sending ICMP packets whose type matches
 	icmp_ratemask (see below) to specific targets.
-	0 to disable any limiting,
-	otherwise the minimal space between responses in milliseconds.
-	Default: 1000
+	0 to disable any limiting, otherwise the maximal rate in jiffies(1)
+	Default: 100
 
 icmp_ratemask - INTEGER
 	Mask made of ICMP types for which rates are being limited.
@@ -1025,23 +1024,11 @@ max_addresses - INTEGER
 	autoconfigured addresses.
 	Default: 16
 
-disable_ipv6 - BOOLEAN
-	Disable IPv6 operation.
-	Default: FALSE (enable IPv6 operation)
-
-accept_dad - INTEGER
-	Whether to accept DAD (Duplicate Address Detection).
-	0: Disable DAD
-	1: Enable DAD (default)
-	2: Enable DAD, and disable IPv6 operation if MAC-based duplicate
-	   link-local address has been found.
-
 icmp/*:
 ratelimit - INTEGER
 	Limit the maximal rates for sending ICMPv6 packets.
-	0 to disable any limiting,
-	otherwise the minimal space between responses in milliseconds.
-	Default: 1000
+	0 to disable any limiting, otherwise the maximal rate in jiffies(1)
+	Default: 100
 
 
 IPv6 Update by:

trunk/Documentation/networking/s2io.txt

@@ -83,9 +83,9 @@ Valid range: Limited by memory on system
 Default: 30 
 
 e. intr_type
-Specifies interrupt type. Possible values 0(INTA), 2(MSI-X)
-Valid values: 0, 2
-Default: 2
+Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X)
+Valid range: 1-3
+Default: 1 
 
 5.  Performance suggestions
 General: