Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Thu, 26 Apr 2018 10:26:37 +0000 (13:26 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 26 Apr 2018 10:26:37 +0000 (13:26 +0300)
commit0ddcf3e76ae4d02918e609342a1020b50258fadd
tree940b90c384895782eeb769e93a65ecf14ff474ae
parent51c12756de427ee0ff90e2f00e121d2f5311c140
parentaf8a41cccf8f469165c6debc8fe07c5fd2ca501a
Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

To fix a conflict reported by Stephen Rothwell <sfr@canb.auug.org.au>:

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")

from the wireless-drivers tree and commits:

  9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common files")
  4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")

from the wireless-drivers-next tree.
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c