lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 Oct 2009 14:18:00 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Randy Dunlap <randy.dunlap@...cle.com>, Greg Kroah-Hartman <gregkh@...e.de>, Larry Finger <Larry.Finger@...inger.net>, "John W. Linville" <linville@...driver.com> Subject: linux-next: manual merge of the net/wireless tree with the staging.current tree Hi all, Today's linux-next merge of the net tree got conflicts in drivers/staging/rtl8187se/Kconfig and drivers/staging/rtl8192e/Kconfig between commit a26961e914c88e3e2ed46ef67f83a33ad7b57c36 ("Staging: fix wireless drivers depends") from the staging.current tree and commit 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper selection of WIRELESS_EXT and WEXT_PRIV") from the net/wireless tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc drivers/staging/rtl8187se/Kconfig index 203c79b,faf6c60..0000000 --- a/drivers/staging/rtl8187se/Kconfig +++ b/drivers/staging/rtl8187se/Kconfig @@@ -1,6 -1,7 +1,7 @@@ config RTL8187SE tristate "RealTek RTL8187SE Wireless LAN NIC driver" - depends on PCI + depends on PCI && WLAN - depends on WIRELESS_EXT + select WIRELESS_EXT + select WEXT_PRIV default N ---help--- diff --cc drivers/staging/rtl8192e/Kconfig index 37e4fde,5c077b9..0000000 --- a/drivers/staging/rtl8192e/Kconfig +++ b/drivers/staging/rtl8192e/Kconfig @@@ -1,6 -1,7 +1,7 @@@ config RTL8192E tristate "RealTek RTL8192E Wireless LAN NIC driver" - depends on PCI + depends on PCI && WLAN - depends on WIRELESS_EXT + select WIRELESS_EXT + select WEXT_PRIV default N ---help--- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists