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

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/ethernet/intel/e1000e/param.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

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

diff --cc drivers/net/ethernet/dlink/dl2k.c
Simple merge

diff --cc drivers/net/ethernet/dlink/dl2k.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 7bb2e97af8986e900e81c48e8fe1eb51cdba8a14,c3ee9103ff4f12c11b436f018f2ac99f304a384c..1aa592834d29695bed66b60ebd71f6ca131f52a6
--- 1/drivers/net/ethernet/emulex/benet/be.h
--- 2/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -32,9 -32,8 +32,9 @@@
  #include <linux/u64_stats_sync.h>
  
  #include "be_hw.h"
 +#include "be_roce.h"
  
- #define DRV_VER                       "4.2.116u"
+ #define DRV_VER                       "4.2.220u"
  #define DRV_NAME              "be2net"
  #define BE_NAME                       "ServerEngines BladeEngine2 10Gbps NIC"
  #define BE3_NAME              "ServerEngines BladeEngine3 10Gbps NIC"
@@@ -379,22 -399,7 +401,18 @@@ struct be_adapter 
        u32 rx_fc;              /* Rx flow control */
        u32 tx_fc;              /* Tx flow control */
        bool stats_cmd_sent;
-       int link_speed;
-       u8 port_type;
-       u8 transceiver;
-       u8 autoneg;
        u8 generation;          /* BladeEngine ASIC generation */
 +      u32 if_type;
 +      struct {
 +              u8 __iomem *base;       /* Door Bell */
 +              u32 size;
 +              u32 total_size;
 +              u64 io_addr;
 +      } roce_db;
 +      u32 num_msix_roce_vec;
 +      struct ocrdma_dev *ocrdma_dev;
 +      struct list_head entry;
 +
        u32 flash_status;
        struct completion flash_compl;
  
@@@ -606,17 -602,5 +625,18 @@@ extern void be_link_status_update(struc
  extern void be_parse_stats(struct be_adapter *adapter);
  extern int be_load_fw(struct be_adapter *adapter, u8 *func);
  extern bool be_is_wol_supported(struct be_adapter *adapter);
+ extern bool be_pause_supported(struct be_adapter *adapter);
 +
 +/*
 + * internal function to initialize-cleanup roce device.
 + */
 +extern void be_roce_dev_add(struct be_adapter *);
 +extern void be_roce_dev_remove(struct be_adapter *);
 +
 +/*
 + * internal function to open-close roce device during ifup-ifdown.
 + */
 +extern void be_roce_dev_open(struct be_adapter *);
 +extern void be_roce_dev_close(struct be_adapter *);
 +
  #endif                                /* BE_H */

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

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_hw.h
Simple merge

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

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/param.c
Simple merge

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

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

diff --cc drivers/net/wireless/ath/ath9k/ar5008_phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/eeprom_9287.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.h
Simple merge

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-1000.c
index 8d80e233bc7a73aec74b267edb61bd191bdf5eb2,8c7a0cd13854ee1eb3e467a611df4b5a55195248..2629a6602dfaa88465e869f265ff58ce4feae1ec
--- 1/drivers/net/wireless/iwlwifi/iwl-1000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@@ -24,30 -24,16 +24,16 @@@
   *
   *****************************************************************************/
  
- #include <linux/kernel.h>
  #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/delay.h>
- #include <linux/skbuff.h>
- #include <linux/netdevice.h>
- #include <net/mac80211.h>
- #include <linux/etherdevice.h>
- #include <asm/unaligned.h>
  #include <linux/stringify.h>
- 
- #include "iwl-eeprom.h"
- #include "iwl-dev.h"
- #include "iwl-core.h"
- #include "iwl-io.h"
- #include "iwl-agn.h"
- #include "iwl-agn-hw.h"
- #include "iwl-shared.h"
+ #include "iwl-config.h"
  #include "iwl-cfg.h"
- #include "iwl-prph.h"
+ #include "iwl-csr.h"
+ #include "iwl-agn-hw.h"
  
  /* Highest firmware API version supported */
 -#define IWL1000_UCODE_API_MAX 6
 -#define IWL100_UCODE_API_MAX 6
 +#define IWL1000_UCODE_API_MAX 5
 +#define IWL100_UCODE_API_MAX 5
  
  /* Oldest version we won't warn about */
  #define IWL1000_UCODE_API_OK 5

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

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
index de0920c74cdd2369b7a528de29536163aba01f50,67d4ef26043b4aa76b679bfb09d9ed0d9c52597c..8e26bc825f23bdae076eec51ab3d218cb531704f
--- 1/drivers/net/wireless/iwlwifi/iwl-5000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@@ -330,8 -70,8 +74,9 @@@ static const struct iwl_ht_params iwl50
  #define IWL_DEVICE_5000                                               \
        .fw_name_pre = IWL5000_FW_PRE,                          \
        .ucode_api_max = IWL5000_UCODE_API_MAX,                 \
 +      .ucode_api_ok = IWL5000_UCODE_API_OK,                   \
        .ucode_api_min = IWL5000_UCODE_API_MIN,                 \
+       .device_family = IWL_DEVICE_FAMILY_5000,                \
        .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
        .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
@@@ -376,8 -115,8 +120,9 @@@ const struct iwl_cfg iwl5350_agn_cfg = 
        .name = "Intel(R) WiMAX/WiFi Link 5350 AGN",
        .fw_name_pre = IWL5000_FW_PRE,
        .ucode_api_max = IWL5000_UCODE_API_MAX,
 +      .ucode_api_ok = IWL5000_UCODE_API_OK,
        .ucode_api_min = IWL5000_UCODE_API_MIN,
+       .device_family = IWL_DEVICE_FAMILY_5000,
        .max_inst_size = IWLAGN_RTC_INST_SIZE,
        .max_data_size = IWLAGN_RTC_DATA_SIZE,
        .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@@ -392,8 -130,8 +136,9 @@@
  #define IWL_DEVICE_5150                                               \
        .fw_name_pre = IWL5150_FW_PRE,                          \
        .ucode_api_max = IWL5150_UCODE_API_MAX,                 \
 +      .ucode_api_ok = IWL5150_UCODE_API_OK,                   \
        .ucode_api_min = IWL5150_UCODE_API_MIN,                 \
+       .device_family = IWL_DEVICE_FAMILY_5150,                \
        .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
        .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
        .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \

diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
index f0c91505a7f775ac0e8cb819dca0be1bfc983094,08afedf4b3ec82f10de43a861fb9c08060235ba3..381b02cf339c46e0353b07bf04f201b70f49a4bf
--- 1/drivers/net/wireless/iwlwifi/iwl-6000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@@ -390,8 -190,9 +192,9 @@@ const struct iwl_cfg iwl6005_2agn_mow2_
  #define IWL_DEVICE_6030                                               \
        .fw_name_pre = IWL6030_FW_PRE,                          \
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
 -      .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
 +      .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
+       .device_family = IWL_DEVICE_FAMILY_6030,                \
        .max_inst_size = IWL60_RTC_INST_SIZE,                   \
        .max_data_size = IWL60_RTC_DATA_SIZE,                   \
        .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \

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

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

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/net/wireless/ti/wl1251/main.c
Simple merge

diff --cc drivers/net/wireless/ti/wl1251/sdio.c
Simple merge

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

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

diff --cc net/ieee802154/6lowpan.c
Simple merge

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

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

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