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

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-xp-matrix.dts
Simple merge

diff --cc arch/sparc/include/asm/checksum_32.h
Simple merge

diff --cc arch/sparc/include/asm/checksum_64.h
Simple merge

diff --cc drivers/clk/ti/clk-43xx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 8735ef1f44ae8fadd5cae19b0f5b404ffe6ef901,32682edfe5a42b7512aedb295bb8f6c7230c569c..39236720487792bc9305b7ac4821c91c6b108dad
--- 1/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- 2/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -826,9 -825,8 +825,8 @@@ static int iwl_mvm_mac_add_interface(st
        if (ret)
                goto out_remove_mac;
  
 -      if (!mvm->bf_allowed_vif &&
 +      if (!mvm->bf_allowed_vif && false &&
-           vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
-           mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){
+           vif->type == NL80211_IFTYPE_STATION && !vif->p2p) {
                mvm->bf_allowed_vif = mvmvif;
                vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
                                     IEEE80211_VIF_SUPPORTS_CQM_RSSI;

diff --cc drivers/s390/net/qeth_core_main.c
index e89f38c3117606dd8d4a83226c44baf2e4f22bb1,34993009a9e12d67df04ff06f10a46d5dd2cb58e..7b7a686abefc23bbe9095a5071aa231879b0c7eb
--- 1/drivers/s390/net/qeth_core_main.c
--- 2/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@@ -20,9 -20,9 +20,10 @@@
  #include <linux/kthread.h>
  #include <linux/slab.h>
  #include <net/iucv/af_iucv.h>
+ #include <net/dsfield.h>
  
  #include <asm/ebcdic.h>
 +#include <asm/chpid.h>
  #include <asm/io.h>
  #include <asm/sysinfo.h>
  #include <asm/compat.h>

diff --cc include/uapi/linux/audit.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge