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

Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_3ad.c
Simple merge

diff --cc drivers/net/bonding/bond_3ad.h
index 3b97fe487dcac523117b560947335ce6666ff371,f4dd9592ac62561fb8967843446d6a9c0463b7e7..bb03b1df2f3e799da32d82ca2a5226c8bd031647
--- 1/drivers/net/bonding/bond_3ad.h
--- 2/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@@ -251,8 -251,9 +251,9 @@@ struct ad_system 
  #define SLAVE_AD_INFO(slave) ((slave)->ad_info)
  
  struct ad_bond_info {
 -      struct ad_system system;            /* 802.3ad system structure */
 -      u32 agg_select_timer;       // Timer to select aggregator after all adapter's hand shakes
 +      struct ad_system system;        /* 802.3ad system structure */
 +      u32 agg_select_timer;           /* Timer to select aggregator after all adapter's hand shakes */
+       u16 aggregator_identifier;
  };
  
  struct ad_slave_info {

diff --cc drivers/net/bonding/bond_main.c
index ac4a1b88115e0dd6ef0cf6f7a5589392bebf5c50,1c6104d3501d4df22e95beab7b60be63548dcc53..afae7cab5cf64d376127ae905317a23e4c275383
--- 1/drivers/net/bonding/bond_main.c
--- 2/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@@ -1541,12 -1547,13 +1542,13 @@@ int bond_enslave(struct net_device *bon
                write_lock_bh(&bond->curr_slave_lock);
                bond_select_active_slave(bond);
                write_unlock_bh(&bond->curr_slave_lock);
+               unblock_netpoll_tx();
        }
  
 -      pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
 +      pr_info("%s: Enslaving %s as %s interface with %s link\n",
                bond_dev->name, slave_dev->name,
 -              bond_is_active_slave(new_slave) ? "n active" : " backup",
 -              new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 +              bond_is_active_slave(new_slave) ? "an active" : "a backup",
 +              new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
  
        /* enslave is successful */
        return 0;
@@@ -2855,9 -2865,11 +2859,11 @@@ static int bond_slave_netdev_event(unsi
                        break;
                }
  
 -              pr_info("%s: Primary slave changed to %s, reselecting active slave.\n",
 -                      bond->dev->name, bond->primary_slave ? slave_dev->name :
 -                                                             "none");
 +              pr_info("%s: Primary slave changed to %s, reselecting active slave\n",
 +                      bond->dev->name,
 +                      bond->primary_slave ? slave_dev->name : "none");
+ 
+               block_netpoll_tx();
                write_lock_bh(&bond->curr_slave_lock);
                bond_select_active_slave(bond);
                write_unlock_bh(&bond->curr_slave_lock);

diff --cc drivers/net/bonding/bond_options.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

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

diff --cc include/linux/netdevice.h
Simple merge

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

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

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

diff --cc net/tipc/link.c
index e4f233d58d35c1d3f49be32787f7fac471ab9040,da6018beb6ebc149b72efd816f4d7154bc6cdfd7..284d6383ad6ccca32ee60eb04fcc15d3a745b90e
--- 1/net/tipc/link.c
--- 2/net/tipc/link.c
+++ b/net/tipc/link.c
@@@ -1717,8 -1709,9 +1723,9 @@@ static void link_handle_out_of_seq_msg(
                                &l_ptr->newest_deferred_in, buf)) {
                l_ptr->deferred_inqueue_sz++;
                l_ptr->stats.deferred_recv++;
+               TIPC_SKB_CB(buf)->deferred = true;
                if ((l_ptr->deferred_inqueue_sz % 16) == 1)
 -                      tipc_link_send_proto_msg(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
 +                      tipc_link_proto_xmit(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
        } else
                l_ptr->stats.duplicates++;
  }