linux-next: manual merge of the staging tree with the crypto tree

[Stephen Rothwell]

Hi all,

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

  drivers/staging/rtl8192e/Kconfig

between commit:

  054694a46d64 ("staging/rtl8192e: switch to RC4 library interface")

from the crypto tree and commits:

  243d040a6e4a ("staging: rtl8192e: fix kconfig dependency warning for RTLLIB_CRYPTO_TKIP")
  02c4260713d6 ("staging: rtl8192e: fix kconfig dependency warning for RTLLIB_CRYPTO_WEP")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/rtl8192e/Kconfig
index 4c440bdaaf6e,31e076cc6f16..000000000000
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@@ -25,7 -26,8 +26,8 @@@ config RTLLIB_CRYPTO_CCM
  config RTLLIB_CRYPTO_TKIP
  	tristate "Support for rtllib TKIP crypto"
  	depends on RTLLIB
+ 	select CRYPTO
 -	select CRYPTO_ARC4
 +	select CRYPTO_LIB_ARC4
  	select CRYPTO_MICHAEL_MIC
  	default y
  	help
@@@ -35,7 -37,8 +37,8 @@@
  
  config RTLLIB_CRYPTO_WEP
  	tristate "Support for rtllib WEP crypto"
+ 	select CRYPTO
 -	select CRYPTO_ARC4
 +	select CRYPTO_LIB_ARC4
  	depends on RTLLIB
  	default y
  	help

Attachment: pgp8eoqAdN1if.pgp
Description: OpenPGP digital signature