On Thu, Mar 26, 2020 at 10:55 PM Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Thu, Mar 19, 2020 at 12:01:14PM -0600, Jason A. Donenfeld wrote:
> > The .S_shipped yields a .S, and the pattern in these directories is to
> > add that to .gitignore so that git-status doesn't raise a fuss.
> >
> > Fixes: a6b803b3ddc7 ("crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation")
> > Fixes: f569ca164751 ("crypto: arm64/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation")
> > Reported-by: Emil Renner Berthing <kernel@xxxxxxxx>
> > Cc: Ard Biesheuvel <ardb@xxxxxxxxxx>
> > Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
> > ---
> > arch/arm/crypto/.gitignore | 1 +
> > arch/arm64/crypto/.gitignore | 1 +
> > 2 files changed, 2 insertions(+)
>
> Patch applied.
>
> > diff --git a/arch/arm64/crypto/.gitignore b/arch/arm64/crypto/.gitignore
> > index 879df8781ed5..e403b1343328 100644
> > --- a/arch/arm64/crypto/.gitignore
> > +++ b/arch/arm64/crypto/.gitignore
> > @@ -1,2 +1,3 @@
> > sha256-core.S
> > sha512-core.S
> > +poly1305-core.S
>
> This didn't apply because a similar patch had already been added
> to cryptodev a month ago. Please base your patches on the latest
> cryptodev in future.
I had sent this with [PATCH crypto] in the subject line, meant for
crypto-2.6.git for 5.6, since it's a bug fix for the things there. I
didn't realize you were queuing these changes for 5.7 instead.
