From: Greg KH <greg@kroah.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Crypto List <linux-crypto@vger.kernel.org>,
Ard Biesheuvel <ardb@kernel.org>,
Necip Fazil Yildiran <fazilyildiran@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the crypto tree
Date: Fri, 18 Sep 2020 10:05:33 +0200 [thread overview]
Message-ID: <20200918080533.GA994032@kroah.com> (raw)
In-Reply-To: <20200918075036.GA24315@gondor.apana.org.au>
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
next prev parent reply other threads:[~2020-09-18 8:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 5:21 linux-next: manual merge of the staging tree with the crypto tree Stephen Rothwell
2020-09-18 5:41 ` Herbert Xu
2020-09-18 7:49 ` Greg KH
2020-09-18 7:50 ` Herbert Xu
2020-09-18 8:05 ` Greg KH [this message]
2020-09-20 14:01 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2018-07-09 4:15 Stephen Rothwell
2018-08-15 23:49 ` Stephen Rothwell
2018-03-15 6:58 Stephen Rothwell
2018-03-15 10:18 ` Greg KH
2016-02-22 3:55 Stephen Rothwell
2016-02-23 1:36 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918080533.GA994032@kroah.com \
--to=greg@kroah.com \
--cc=ardb@kernel.org \
--cc=fazilyildiran@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.