Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1287 commits)
  icmp: Fix regression in nexthop resolution during replies.
  net: Fix ppc64 BPF JIT dependencies.
  acenic: include NET_SKB_PAD headroom to incoming skbs
  ixgbe: convert to ndo_fix_features
  ixgbe: only enable WoL for magic packet by default
  ixgbe: remove ifdef check for non-existent define
  ixgbe: Pass staterr instead of re-reading status and error bits from descriptor
  ixgbe: Move interrupt related values out of ring and into q_vector
  ixgbe: add structure for containing RX/TX rings to q_vector
  ixgbe: inline the ixgbe_maybe_stop_tx function
  ixgbe: Update ATR to use recorded TX queues instead of CPU for routing
  igb: Fix for DH89xxCC near end loopback test
  e1000: always call e1000_check_for_link() on e1000_ce4100 MACs.
  netxen: add fw version compatibility check
  be2net: request native mode each time the card is reset
  ipv4: Constrain UFO fragment sizes to multiples of 8 bytes
  virtio_net: Fix panic in virtnet_remove
  ipv6: make fragment identifications less predictable
  ipv6: unshare inetpeers
  can: make function can_get_bittiming static
  ...

diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 8906648..445289c 100644 (file)
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -402,8 +402,9 @@
 !Finclude/net/mac80211.h set_key_cmd
 !Finclude/net/mac80211.h ieee80211_key_conf
 !Finclude/net/mac80211.h ieee80211_key_flags
-!Finclude/net/mac80211.h ieee80211_tkip_key_type
-!Finclude/net/mac80211.h ieee80211_get_tkip_key
+!Finclude/net/mac80211.h ieee80211_get_tkip_p1k
+!Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv
+!Finclude/net/mac80211.h ieee80211_get_tkip_p2k
 !Finclude/net/mac80211.h ieee80211_key_removed
       </chapter>
 

diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c
index 2bac961..65968fb 100644 (file)
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
                case 'V': opt_V++; exclusive++; break;
 
                case '?':
-                       fprintf(stderr, usage_msg);
+                       fprintf(stderr, "%s", usage_msg);
                        res = 2;
                        goto out;
                }
@@ -268,13 +268,13 @@ int main(int argc, char *argv[])
 
        /* options check */
        if (exclusive > 1) {
-               fprintf(stderr, usage_msg);
+               fprintf(stderr, "%s", usage_msg);
                res = 2;
                goto out;
        }
 
        if (opt_v || opt_V) {
-               printf(version);
+               printf("%s", version);
                if (opt_V) {
                        res = 0;
                        goto out;
@@ -282,14 +282,14 @@ int main(int argc, char *argv[])
        }
 
        if (opt_u) {
-               printf(usage_msg);
+               printf("%s", usage_msg);
                res = 0;
                goto out;
        }
 
        if (opt_h) {
-               printf(usage_msg);
-               printf(help_msg);
+               printf("%s", usage_msg);
+               printf("%s", help_msg);
                res = 0;
                goto out;
        }
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
                        goto out;
                } else {
                        /* Just show usage */
-                       fprintf(stderr, usage_msg);
+                       fprintf(stderr, "%s", usage_msg);
                        res = 2;
                        goto out;
                }
@@ -320,7