| Message ID | 20200918152127.4414b524@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | linux-next: manual merge of the staging tree with the crypto tree | expand |
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. > 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. Thanks,
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
On Fri, Sep 18, 2020 at 09:49:11AM +0200, Greg KH wrote: > > Ok, I'll go revert these. Thanks! > > 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? It's in the cryptodev tree, but unfortunately it's not in a topic branch so you'd be pulling all other crypto changes along with it. Cheers,
On Fri, Sep 18, 2020 at 05:50:36PM +1000, Herbert Xu wrote: > On Fri, Sep 18, 2020 at 09:49:11AM +0200, Greg KH wrote: > > > > Ok, I'll go revert these. > > Thanks! > > > > 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? > > It's in the cryptodev tree, but unfortunately it's not in a > topic branch so you'd be pulling all other crypto changes along > with it. Ok, no worries, I'll just revert the above commits and all should be good. thanks, greg k-h
On Fri, Sep 18, 2020 at 05:50:36PM +1000, Herbert Xu wrote: > On Fri, Sep 18, 2020 at 09:49:11AM +0200, Greg KH wrote: > > > > Ok, I'll go revert these. > > Thanks! > > > > 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? > > It's in the cryptodev tree, but unfortunately it's not in a > topic branch so you'd be pulling all other crypto changes along > with it. Sorry for the delay, this is now fixed up in my tree. greg k-h
diff --cc drivers/staging/rtl8192e/Kconfig index 4c440bdaaf6e,31e076cc6f16..000000000000 --- a/drivers/staging/rtl8192e/Kconfig
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.