]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1c56e03b46e7d9fa832eb35cb736b2e008735d44
tree940b90c384895782eeb769e93a65ecf14ff474ae
parentdf8bad02b735393744313ca9354bfeb52e49b32d
parent24c7a39a5069fb741c37a1b21156cd308f22986e
Merge git://git.kernel.org/pub/scm/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:

  1a358ae6a97e ("iwlwifi: mvm: query regdb for wmm rule if needed")

from the wireless-drivers tree and commits:

  2d33483f9668 ("iwlwifi: move all NVM parsing code to the common files")
  aa27faf58c75 ("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