Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

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

diff --cc drivers/net/ethernet/marvell/sky2.c
index 539de09cffc956b50d8039d07a03959db5298918,7db6e36ec4f91717c123c37e4471287e47974892..35100bd8bef7eb6395cb25e786835f6f8b21b287
--- 1/drivers/net/ethernet/marvell/sky2.c
--- 2/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@@ -1275,16 -1274,8 +1275,16 @@@ static void rx_set_checksum(struct sky2
                     ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
  }
  
 +/*
 + * Fixed initial key as seed to RSS.
 + */
 +static const uint32_t rss_init_key[10] = {
 +      0x7c3351da, 0x51c5cf4e, 0x44adbdd1, 0xe8d38d18, 0x48897c43,
 +      0xb1d60e7e, 0x6a3dd760, 0x01a2e453, 0x16f46f13, 0x1a0e7b30
 +};
 +
  /* Enable/disable receive hash calculation (RSS) */
- static void rx_set_rss(struct net_device *dev, u32 features)
+ static void rx_set_rss(struct net_device *dev, netdev_features_t features)
  {
        struct sky2_port *sky2 = netdev_priv(dev);
        struct sky2_hw *hw = sky2->hw;

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

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

diff --cc drivers/net/ethernet/xilinx/ll_temac_main.c
Simple merge

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

diff --cc drivers/net/wireless/libertas/cfg.c
index a7f1ab28940d3ae6ad8e4fbda26b18087b4c21b4,89f34ad8d34acd1f01ba34644339bdffa228fdb1..d1d84e0e30fcfd2e6a19aa11dbdc6e6db2c77112
--- 1/drivers/net/wireless/libertas/cfg.c
--- 2/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -632,9 -633,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
                                     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
  
                        if (channel &&
-                           !(channel->flags & IEEE80211_CHAN_DISABLED))
-                               cfg80211_inform_bss(wiphy, channel,
+                           !(channel->flags & IEEE80211_CHAN_DISABLED)) {
+                               bss = cfg80211_inform_bss(wiphy, channel,
 -                                      bssid, le64_to_cpu(*(__le64 *)tsfdesc),
 +                                      bssid, get_unaligned_le64(tsfdesc),
                                        capa, intvl, ie, ielen,
                                        LBS_SCAN_RSSI_TO_MBM(rssi),
                                        GFP_KERNEL);

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

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc drivers/virtio/virtio_pci.c
Simple merge

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

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

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

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