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

Conflicts:
	drivers/net/ethernet/intel/e1000e/ethtool.c
	drivers/net/vmxnet3/vmxnet3_drv.c
	drivers/net/wireless/iwlwifi/dvm/tx.c
	net/ipv6/route.c

The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.

The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.

The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.

The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.

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

diff --cc drivers/net/can/c_can/c_can.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 4010cb7,f1b3df1..28ceb84
--- 1/drivers/net/ethernet/emulex/benet/be.h
--- 2/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -34,11 -34,11 +34,11 @@@
  #include "be_hw.h"
  #include "be_roce.h"
  
 -#define DRV_VER                       "4.4.161.0u"
 +#define DRV_VER                       "4.6.62.0u"
  #define DRV_NAME              "be2net"
- #define BE_NAME                       "ServerEngines BladeEngine2 10Gbps NIC"
- #define BE3_NAME              "ServerEngines BladeEngine3 10Gbps NIC"
- #define OC_NAME                       "Emulex OneConnect 10Gbps NIC"
+ #define BE_NAME                       "Emulex BladeEngine2"
+ #define BE3_NAME              "Emulex BladeEngine3"
+ #define OC_NAME                       "Emulex OneConnect"
  #define OC_NAME_BE            OC_NAME "(be3)"
  #define OC_NAME_LANCER                OC_NAME "(Lancer)"
  #define OC_NAME_SH            OC_NAME "(Skyhawk)"

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/via/via-rhine.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
index b1c90f8,12c6440..ffb97b2
--- 1/drivers/net/vmxnet3/vmxnet3_drv.c
--- 2/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@@ -148,10 -152,9 +148,9 @@@ vmxnet3_check_link(struct vmxnet3_adapt
  
        adapter->link_speed = ret >> 16;
        if (ret & 1) { /* Link is up. */
 -              printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
 -                     adapter->netdev->name, adapter->link_speed);
 +              netdev_info(adapter->netdev, "NIC Link is Up %d Mbps\n",
 +                          adapter->link_speed);
-               if (!netif_carrier_ok(adapter->netdev))
-                       netif_carrier_on(adapter->netdev);
+               netif_carrier_on(adapter->netdev);
  
                if (affectTxQueue) {
                        for (i = 0; i < adapter->num_tx_queues; i++)
@@@ -159,9 -162,9 +158,8 @@@
                                                 adapter);
                }
        } else {
 -              printk(KERN_INFO "%s: NIC Link is Down\n",
 -                     adapter->netdev->name);
 +              netdev_info(adapter->netdev, "NIC Link is Down\n");
-               if (netif_carrier_ok(adapter->netdev))
-                       netif_carrier_off(adapter->netdev);
+               netif_carrier_off(adapter->netdev);
  
                if (affectTxQueue) {
                        for (i = 0; i < adapter->num_tx_queues; i++)

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge

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

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

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

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

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

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

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

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

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