Messages in this thread | | | Date | Fri, 18 Sep 2020 10:05:33 +0200 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the crypto tree |
| |
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
| |