Messages in this thread | | | Date | Fri, 18 Sep 2020 09:49:11 +0200 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the crypto tree |
| |
On Fri, Sep 18, 2020 at 03:41:34PM +1000, Herbert Xu wrote: > On Fri, Sep 18, 2020 at 03:21:27PM +1000, Stephen Rothwell wrote: > > 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. > > Those two commits should just be dropped.
Ok, I'll go revert these.
> > > 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 > > As the driver has been converted over to the lib arc4 API, it > does not need to select CRYPTO at all.
Is it converted in your tree? If so, have a branch/tag I can pull in to prevent merge issues in the future?
thanks,
greg k-h
| |