lkml.org 
[lkml]   [2015]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Hi Kalle,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/iwlwifi/Kconfig between commit
ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") from
the wireless-drivers tree and commit 87411456834a ("iwlwifi: clarify
the device / firmware mapping in Kconfig") from the
wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/Kconfig
index f89f446e5c8a,99f9760fc11e..000000000000
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
Intel 7260 Wi-Fi Adapter
Intel 3160 Wi-Fi Adapter
Intel 7265 Wi-Fi Adapter
+ Intel 3165 Wi-Fi Adapter
+ Intel 8260 Wi-Fi Adapter


This driver uses the kernel's mac80211 subsystem.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-05-25 05:21    [W:0.036 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site