Hi Kalle,

This is the fourth batch of fixes for v5.1.  It contains two fixes I
send in the last patchset plus a patch that I sent separately to fix a
merge damage caused by the previous pull.  More details about the
contents in the tag description.

I have sent this out before and kbuildbot reported success.

Please let me know if there are any issues.

Cheers,
Luca.


The following changes since commit b82d6c1f8f8288f744a9dcc16cd3085d535decca:

  mwifiex: Make resume actually do something useful again on SDIO cards (2019-04-25 14:05:14 +0300)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git tags/iwlwifi-for-kalle-2019-04-28

for you to fetch changes up to d156e67d3f58c5d3c7ebe1bec80657db534f32d4:

  iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() (2019-04-28 09:59:59 +0300)

----------------------------------------------------------------
Fourth batch of patches intended for v5.1

* 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;

----------------------------------------------------------------
Emmanuel Grumbach (1):
      iwlwifi: fix driver operation for 5350

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()

 drivers/net/wireless/intel/iwlwifi/cfg/5000.c        |  3 ++-
 drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c |  6 ------
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c        | 28 ++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 11 deletions(-)