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

Pull networking fixes from David Miller:

 1) If an IPVS tunnel is created with a mixed-family destination
    address, it cannot be removed.  Fix from Alexey Andriyanov.

 2) Fix module refcount underflow in netfilter's nft_compat, from Pablo
    Neira Ayuso.

 3) Generic statistics infrastructure can reference variables sitting on
    a released function stack, therefore use dynamic allocation always.
    Fix from Ignacy Gawędzki.

 4) skb_copy_bits() return value test is inverted in ip_check_defrag().

 5) Fix network namespace exit in openvswitch, we have to release all of
    the per-net vports.  From Pravin B Shelar.

 6) Fix signedness bug in CAIF's cfpkt_iterate(), from Dan Carpenter.

 7) Fix rhashtable grow/shrink behavior, only expand during inserts and
    shrink during deletes.  From Daniel Borkmann.

 8) Netdevice names with semicolons should never be allowed, because
    they serve as a separator.  From Matthew Thode.

 9) Use {,__}set_current_state() where appropriate, from Fabian
    Frederick.

10) Revert byte queue limits support in r8169 driver, it's causing
    regressions we can't figure out.

11) tcp_should_expand_sndbuf() erroneously uses tp->packets_out to
    measure packets in flight, properly use tcp_packets_in_flight()
    instead.  From Neal Cardwell.

12) Fix accidental removal of support for bluetooth in CSR based Intel
    wireless cards.  From Marcel Holtmann.

13) We accidently added a behavioral change between native and compat
    tasks, wrt testing the MSG_CMSG_COMPAT bit.  Just ignore it if the
    user happened to set it in a native binary as that was always the
    behavior we had.  From Catalin Marinas.

14) Check genlmsg_unicast() return valud in hwsim netlink tx frame
    handling, from Bob Copeland.

15) Fix stale ->radar_required setting in mac80211 that can prevent
    starting new scans, from Eliad Peller.

16) Fix memory leak in nl80211 monitor, from Johannes Berg.

17) Fix race in TX index handling in xen-netback, from David Vrabel.

18) Don't enable interrupts in amx-xgbe driver until all software et al.
    state is ready for the interrupt handler to run.  From Thomas
    Lendacky.

19) Add missing netlink_ns_capable() checks to rtnl_newlink(), from Eric
    W Biederman.

20) The amount of header space needed in macvtap was not calculated
    properly, fix it otherwise we splat past the beginning of the
    packet.  From Eric Dumazet.

21) Fix bcmgenet TCP TX perf regression, from Jaedon Shin.

22) Don't raw initialize or mod timers, use setup_timer() and
    mod_timer() instead.  From Vaishali Thakkar.

23) Fix software maintained statistics in bcmgenet and systemport
    drivers, from Florian Fainelli.

24) DMA descriptor updates in sh_eth need proper memory barriers, from
    Ben Hutchings.

25) Don't do UDP Fragmentation Offload on RAW sockets, from Michal
    Kubecek.

26) Openvswitch's non-masked set actions aren't constructed properly
    into netlink messages, fix from Joe Stringer.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
  openvswitch: Fix serialization of non-masked set actions.
  gianfar: Reduce logging noise seen due to phy polling if link is down
  ibmveth: Add function to enable live MAC address changes
  net: bridge: add compile-time assert for cb struct size
  udp: only allow UFO for packets from SOCK_DGRAM sockets
  sh_eth: Really fix padding of short frames on TX
  Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"
  sh_eth: Fix RX recovery on R-Car in case of RX ring underrun
  sh_eth: Ensure proper ordering of descriptor active bit write/read
  net/mlx4_en: Disbale GRO for incoming loopback/selftest packets
  net/mlx4_core: Fix wrong mask and error flow for the update-qp command
  net: systemport: fix software maintained statistics
  net: bcmgenet: fix software maintained statistics
  rxrpc: don't multiply with HZ twice
  rxrpc: terminate retrans loop when sending of skb fails
  net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
  net: pasemi: Use setup_timer and mod_timer
  net: stmmac: Use setup_timer and mod_timer
  net: 8390: axnet_cs: Use setup_timer and mod_timer
  net: 8390: pcnet_cs: Use setup_timer and mod_timer
  ...

diff --combined MAINTAINERS
index eaf999638a65d453e4982707942ed531cd5702fd,5d1606e9f558bd07306309ab666c6812f96f5bcf..42f686f2e4b241230daeb84318948d330a759a99
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2065,7 -2065,7 +2065,7 @@@ F:      include/net/bluetooth
  BONDING DRIVER
  M:    Jay Vosburgh <j.vosburgh@gmail.com>
  M:    Veaceslav Falico <vfalico@gmail.com>
- M:    Andy Gospodarek <andy@greyhouse.net>
+ M:    Andy Gospodarek <gospo@cumulusnetworks.com>
  L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -2433,8 -2433,7 +2433,8 @@@ F:      arch/powerpc/oprofile/*cell
  F:    arch/powerpc/platforms/cell/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT
 -M:    Sage Weil <sage@inktank.com>
 +M:    Yan, Zheng <zyan@redhat.com>
 +M:    Sage Weil <sage@redhat.com>
  L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
@@@ -3937,7 -3936,7 +3937,7 @@@ S:      Maintaine
  F:    drivers/staging/fbtft/
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 -M:    Robert Love <robert.w.love@intel.com>
 +M:    Vasu Dev <vasu.dev@intel.com>
  L:    fcoe-devel@open-fcoe.org
  W:    www.Open-FCoE.org
  S:    Supported
@@@ -7213,7 -7212,8 +7213,7 @@@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2
  M:    Mark Fasheh <mfasheh@suse.com>
  M:    Joel Becker <jlbec@evilplan.org>
  L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 -W:    http://oss.oracle.com/projects/ocfs2/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
 +W:    http://ocfs2.wiki.kernel.org
  S:    Supported
  F:    Documentation/filesystems/ocfs2.txt
  F:    Documentation/filesystems/dlmfs.txt
@@@ -7302,7 -7302,7 +7302,7 @@@ M:      Alok Kataria <akataria@vmware.com
  M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    virtualization@lists.linux-foundation.org
  S:    Supported
 -F:    Documentation/ia64/paravirt_ops.txt
 +F:    Documentation/virtual/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt.h
  
@@@ -7998,8 -7998,8 +7998,8 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/wcn36xx/
  
  RADOS BLOCK DEVICE (RBD)
 -M:    Yehuda Sadeh <yehuda@inktank.com>
 -M:    Sage Weil <sage@inktank.com>
 +M:    Ilya Dryomov <idryomov@gmail.com>
 +M:    Sage Weil <sage@redhat.com>
  M:    Alex Elder <elder@kernel.org>
  M:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
@@@ -8566,7 -8566,7 +8566,7 @@@ S:      Maintaine
  F:    drivers/scsi/sr*
  
  SCSI RDMA PROTOCOL (SRP) INITIATOR
 -M:    Bart Van Assche <bvanassche@acm.org>
 +M:    Bart Van Assche <bart.vanassche@sandisk.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -9718,11 -9718,6 +9718,11 @@@ L:    linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI CDCE706 CLOCK DRIVER
 +M:    Max Filippov <jcmvbkbc@gmail.com>
 +S:    Maintained
 +F:    drivers/clk/clk-cdce706.c
 +
  TI CLOCK DRIVER
  M:    Tero Kristo <t-kristo@ti.com>
  L:    linux-omap@vger.kernel.org

diff --combined drivers/net/usb/Kconfig
index 3bd9678315ad651beccd96ca1b5d74bcd1e68c1e,0732f9e16128e76d87ef5a40948378d83f02436b..7ba8d0885f120156c47f44884212a2fd73f604b9
--- 1/drivers/net/usb/Kconfig
--- 2/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@@ -161,6 -161,7 +161,7 @@@ config USB_NET_AX8817
            * Linksys USB200M
            * Netgear FA120
            * Sitecom LN-029
+           * Sitecom LN-028
            * Intellinet USB 2.0 Ethernet
            * ST Lab USB 2.0 Ethernet
            * TrendNet TU2-ET100
@@@ -397,14 -398,14 +398,14 @@@ config USB_NET_CDC_SUBSE
          not generally have permanently assigned Ethernet addresses.
  
  config USB_ALI_M5632
 -      boolean "ALi M5632 based 'USB 2.0 Data Link' cables"
 +      bool "ALi M5632 based 'USB 2.0 Data Link' cables"
        depends on USB_NET_CDC_SUBSET
        help
          Choose this option if you're using a host-to-host cable
          based on this design, which supports USB 2.0 high speed.
  
  config USB_AN2720
 -      boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
 +      bool "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
        depends on USB_NET_CDC_SUBSET
        help
          Choose this option if you're using a host-to-host cable
@@@ -412,7 -413,7 +413,7 @@@
          Cypress brand.
  
  config USB_BELKIN
 -      boolean "eTEK based host-to-host cables (Advance, Belkin, ...)"
 +      bool "eTEK based host-to-host cables (Advance, Belkin, ...)"
        depends on USB_NET_CDC_SUBSET
        default y
        help
@@@ -421,7 -422,7 +422,7 @@@
          microcontroller, with LEDs that indicate traffic.
  
  config USB_ARMLINUX
 -      boolean "Embedded ARM Linux links (iPaq, ...)"
 +      bool "Embedded ARM Linux links (iPaq, ...)"
        depends on USB_NET_CDC_SUBSET
        default y
        help
@@@ -438,14 -439,14 +439,14 @@@
          this simpler protocol by installing a different kernel.
  
  config USB_EPSON2888
 -      boolean "Epson 2888 based firmware (DEVELOPMENT)"
 +      bool "Epson 2888 based firmware (DEVELOPMENT)"
        depends on USB_NET_CDC_SUBSET
        help
          Choose this option to support the usb networking links used
          by some sample firmware from Epson.
  
  config USB_KC2190
 -      boolean "KT Technology KC2190 based cables (InstaNet)"
 +      bool "KT Technology KC2190 based cables (InstaNet)"
        depends on USB_NET_CDC_SUBSET
        help
          Choose this option if you're using a host-to-host cable