Messages in this thread | | | Date | Mon, 25 May 2015 13:07:47 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |