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

Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/usb/r8152.c
index a4d4c4a1354fe0c0113272ef72d697991b308d96,604ef210a4dea5f8e8bd9b543b3dc4156b357286..b9a98152815b680ae5c318f893a63d1d5acc864b
--- 1/drivers/net/usb/r8152.c
--- 2/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -22,11 -22,9 +22,11 @@@
  #include <linux/ip.h>
  #include <linux/ipv6.h>
  #include <net/ip6_checksum.h>
 +#include <uapi/linux/mdio.h>
 +#include <linux/mdio.h>
  
  /* Version Information */
- #define DRIVER_VERSION "v1.06.0 (2014/03/03)"
+ #define DRIVER_VERSION "v1.06.1 (2014/10/01)"
  #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
  #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
  #define MODULENAME "r8152"
@@@ -2080,11 -2067,10 +2097,10 @@@ static void rtl_disable(struct r8152 *t
        for (i = 0; i < 1000; i++) {
                if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
                        break;
 -              mdelay(1);
 +              usleep_range(1000, 2000);
        }
  
-       for (i = 0; i < RTL8152_MAX_RX; i++)
-               usb_kill_urb(tp->rx_info[i].urb);
+       rtl_stop_rx(tp);
  
        rtl8152_nic_reset(tp);
  }
@@@ -3211,13 -3105,12 +3203,13 @@@ static int rtl8152_resume(struct usb_in
                } else {
                        tp->rtl_ops.up(tp);
                        rtl8152_set_speed(tp, AUTONEG_ENABLE,
 -                              tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
 -                              DUPLEX_FULL);
 +                                        tp->mii.supports_gmii ?
 +                                        SPEED_1000 : SPEED_100,
 +                                        DUPLEX_FULL);
+                       tp->speed = 0;
+                       netif_carrier_off(tp->netdev);
+                       set_bit(WORK_ENABLE, &tp->flags);
                }
-               tp->speed = 0;
-               netif_carrier_off(tp->netdev);
-               set_bit(WORK_ENABLE, &tp->flags);
                usb_submit_urb(tp->intr_urb, GFP_KERNEL);
        }
  

diff --cc lib/rhashtable.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netfilter/Kconfig
Simple merge

diff --cc net/netfilter/nfnetlink.c
index f77d3f7f22b581af8274cdbf2a9f63d3899f246e,f37f0716a9fc04e58f69bc826e827ce99546cec2..6c5a915cfa758bb4d8187dac9dc606201e99b458
--- 1/net/netfilter/nfnetlink.c
--- 2/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@@ -333,7 -380,8 +380,8 @@@ replay
                         * original skb.
                         */
                        if (err == -EAGAIN) {
 -                              ss->abort(skb);
+                               nfnl_err_reset(&err_list);
 +                              ss->abort(oskb);
                                nfnl_unlock(subsys_id);
                                kfree_skb(nskb);
                                goto replay;
@@@ -357,10 -418,11 +418,11 @@@ ack
        }
  done:
        if (success && done)
 -              ss->commit(skb);
 +              ss->commit(oskb);
        else
 -              ss->abort(skb);
 +              ss->abort(oskb);
  
+       nfnl_err_deliver(&err_list, oskb);
        nfnl_unlock(subsys_id);
        kfree_skb(nskb);
  }