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

Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/bonding/bond_options.c
index 22800bd,298c265..6e6b093
--- 1/drivers/net/bonding/bond_options.c
--- 2/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@@ -173,12 -118,13 +173,13 @@@ static const struct bond_opt_value bond
        { NULL,      -1,  0}
  };
  
 -static struct bond_opt_value bond_lp_interval_tbl[] = {
 +static const struct bond_opt_value bond_lp_interval_tbl[] = {
        { "minval",  1,       BOND_VALFLAG_MIN | BOND_VALFLAG_DEFAULT},
        { "maxval",  INT_MAX, BOND_VALFLAG_MAX},
+       { NULL,      -1,      0},
  };
  
 -static struct bond_option bond_opts[] = {
 +static const struct bond_option bond_opts[] = {
        [BOND_OPT_MODE] = {
                .id = BOND_OPT_MODE,
                .name = "mode",

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

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

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

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

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

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

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

diff --cc drivers/net/ieee802154/at86rf230.c
Simple merge

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

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

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/bt-coex.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/11ac.c
index bb43251,5d9a808..c92f27a
--- 1/drivers/net/wireless/mwifiex/11ac.c
--- 2/drivers/net/wireless/mwifiex/11ac.c
+++ b/drivers/net/wireless/mwifiex/11ac.c
@@@ -192,12 -189,10 +192,11 @@@ int mwifiex_cmd_append_11ac_tlv(struct 
                vht_cap->header.len  =
                                cpu_to_le16(sizeof(struct ieee80211_vht_cap));
                memcpy((u8 *)vht_cap + sizeof(struct mwifiex_ie_types_header),
-                      (u8 *)bss_desc->bcn_vht_cap +
-                      sizeof(struct ieee_types_header),
+                      (u8 *)bss_desc->bcn_vht_cap,
                       le16_to_cpu(vht_cap->header.len));
  
 -              mwifiex_fill_vht_cap_tlv(priv, vht_cap, bss_desc->bss_band);
 +              mwifiex_fill_vht_cap_tlv(priv, &vht_cap->vht_cap,
 +                                       bss_desc->bss_band);
                *buffer += sizeof(*vht_cap);
                ret_len += sizeof(*vht_cap);
        }

diff --cc drivers/net/wireless/mwifiex/11n.c
index 79ead92,7db1a89..d9c65b6
--- 1/drivers/net/wireless/mwifiex/11n.c
--- 2/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@@ -317,11 -308,10 +317,10 @@@ mwifiex_cmd_append_11n_tlv(struct mwifi
                ht_cap->header.len =
                                cpu_to_le16(sizeof(struct ieee80211_ht_cap));
                memcpy((u8 *) ht_cap + sizeof(struct mwifiex_ie_types_header),
-                      (u8 *) bss_desc->bcn_ht_cap +
-                      sizeof(struct ieee_types_header),
+                      (u8 *)bss_desc->bcn_ht_cap,
                       le16_to_cpu(ht_cap->header.len));
  
 -              mwifiex_fill_cap_info(priv, radio_type, ht_cap);
 +              mwifiex_fill_cap_info(priv, radio_type, &ht_cap->ht_cap);
  
                *buffer += sizeof(struct mwifiex_ie_types_htcap);
                ret_len += sizeof(struct mwifiex_ie_types_htcap);

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

diff --cc drivers/net/xen-netback/interface.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
index bc94320,438d0c0..5a8c4a4
--- 1/drivers/net/xen-netback/netback.c
--- 2/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -348,10 -338,6 +348,9 @@@ static int xenvif_gop_skb(struct sk_buf
        int head = 1;
        int old_meta_prod;
        int gso_type;
-       int gso_size;
 +      struct ubuf_info *ubuf = skb_shinfo(skb)->destructor_arg;
 +      grant_ref_t foreign_grefs[MAX_SKB_FRAGS];
 +      struct xenvif *foreign_vif = NULL;
  
        old_meta_prod = npo->meta_prod;
  

diff --cc include/net/sock.h
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

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

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

diff --cc net/l2tp/l2tp_core.c
Simple merge

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

diff --cc net/mac80211/chan.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge

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