Hi Dave, here's one more pull request to net tree for 5.1, more info below. Also note that this pull conflicts with net-next. And I want to emphasie that it's really net-next, so when you pull this to net tree it should go without conflicts. Stephen reported the conflict here: https://lkml.kernel.org/r/20190429115338.5decb50b@xxxxxxxxxxxxxxxx In iwlwifi oddly commit 154d4899e411 adds the IS_ERR_OR_NULL() in wireless-drivers but commit c9af7528c331 removes the whole check in wireless-drivers-next. The fix is easy, just drop the whole check for mvmvif->dbgfs_dir in iwlwifi/mvm/debugfs-vif.c, it's unneeded anyway. As usual, please let me know if you have any problems. Kalle The following changes since commit 614c70f35cd77a9af8e2ca841dcdb121cec3068f: bnx2x: fix spelling mistake "dicline" -> "decline" (2019-04-15 17:23:09 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git tags/wireless-drivers-for-davem-2019-04-30 for you to fetch changes up to 7a0f8ad5ff6323dd8badfeb01d338db146569976: Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (2019-04-29 19:33:33 +0300) ---------------------------------------------------------------- wireless-drivers fixes for 5.1 Third set of fixes for 5.1. iwlwifi * fix an oops when creating debugfs entries * fix bug when trying to capture debugging info while in rfkill * prevent potential uninitialized memory dumps into debugging logs * fix some initialization parameters for AX210 devices * fix an oops with non-MSIX devices * fix an oops when we receive a packet with bogus lengths * fix a bug that prevented 5350 devices from working * fix a small merge damage from the previous series mwifiex * fig regression with resume on SDIO ath10k * fix locking problem with crashdump * fix warnings during suspend and resume ---------------------------------------------------------------- Brian Norris (1): ath10k: perform crash dump collection in workqueue Douglas Anderson (1): mwifiex: Make resume actually do something useful again on SDIO cards Emmanuel Grumbach (1): iwlwifi: fix driver operation for 5350 Greg Kroah-Hartman (1): iwlwifi: mvm: properly check debugfs dentry before using it Johannes Berg (1): iwlwifi: mvm: don't attempt debug collection in rfkill Kalle Valo (3): Merge tag 'iwlwifi-for-kalle-2019-04-19' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge tag 'iwlwifi-for-kalle-2019-04-28' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge ath-current from git://git.kernel.org/.../kvalo/ath.git Luca Coelho (2): iwlwifi: mvm: check for length correctness in iwl_mvm_create_skb() iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() Rafael J. Wysocki (1): ath10k: Drop WARN_ON()s that always trigger during system resume Shahar S Matityahu (2): iwlwifi: don't panic in error path on non-msix systems iwlwifi: dbg_ini: check debug TLV type explicitly Shaul Triebitz (1): iwlwifi: cfg: use family 22560 based_params for AX210 family drivers/net/wireless/ath/ath10k/ce.c | 2 +- drivers/net/wireless/ath/ath10k/core.c | 1 + drivers/net/wireless/ath/ath10k/core.h | 3 +++ drivers/net/wireless/ath/ath10k/coredump.c | 6 ++--- drivers/net/wireless/ath/ath10k/mac.c | 4 ++-- drivers/net/wireless/ath/ath10k/pci.c | 24 +++++++++++++++---- drivers/net/wireless/ath/ath10k/pci.h | 2 ++ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 ++- drivers/net/wireless/intel/iwlwifi/fw/file.h | 15 +++++++----- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 3 ++- .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 +-- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +++- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 28 ++++++++++++++++++---- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 19 ++++++++++----- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- 17 files changed, 88 insertions(+), 35 deletions(-)
