Hi all,
In commit
36303413885e ("crypto: chelsio - Read rxchannel-id from firmware")
Fixes tag
Fixes: 567be3a5d227 ("crypto: chelsio - Use multiple txq/rxq per tfm to
process the requests)
has these problem(s):
- Subject has leading but no trailing quotes
--
Cheers,
S
ceph, ceph: implement msgr2.1 protocol (crc and secure
modes)")
interacting with commit
a24d22b225ce ("crypto: sha - split sha.h into sha1.h and sha2.h")
from the crypto tree (and now in Linus' tree).
I have applied the following merge fix patch:
From: Stephen Rothwell
Date: T
t hasn't been in linux-next -
> > from you this merge window.
>
> It looks like Stephen Rothwell saw it in next yesterday, and fixed it
> up there in his merge.
>
> So somebody was aware of the problem. But unlike Stephen, I don't take
> broken code and just si
ng
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 3b358262de8f,eb18459c1d16..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6932,11 -6913,16 +6941,10 @@@ S: Maintaine
W:http://floa
Hi all,
Commit
50d7e084c48d ("crypto: hisilicon/hpre - add initial settings adapt to
'Kunpeng 930'")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgpPhpRxHzzHz.pgp
Description: OpenPGP digital signature
ooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/crypto/Kconfig
index 52a9b7cf6576,c2950127def6..
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -873,9 -873,7 +873
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.
--
Cheers,
Stephen Rothwell
diff --cc dri
Hi all,
On Fri, 24 Jul 2020 13:09:51 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the crypto tree got a conflict in:
>
> Documentation/crypto/api-intro.rst
>
> between commit:
>
> 5846551bb147 ("docs: crypto: convert api-intro.txt to R
Hi all,
On Tue, 21 Jul 2020 14:28:45 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/include/asm/inst.h
>
> between commit:
>
> d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
Hi all,
On Fri, 17 Jul 2020 20:14:11 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/crypto/mediatek/mtk-aes.c
>
> between commit:
>
> f441ba2ad341 ("crypto: mediatek - use AES library
t to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/crypto/api-intro.rst
index bcff47d42189,40137f93e04f..
--- a/Documentation/crypto/api-intro.rst
+++ b/Documenta
nflicts 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/include/asm/ins
Hi Uros,
On Mon, 20 Jul 2020 08:13:51 +0200 Uros Bizjak wrote:
>
> On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell
> wrote:
>
> > > Please find attached the incremental patch that puts back integer
> > > parts of inst.h. This resolves the conflict with the ti
oving the actual now unused crypto instruction
macros.
--
Cheers,
Stephen Rothwell
pgpNpySF3afQm.pgp
Description: OpenPGP digital signature
ntainer 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.
--
Cheers,
Stephen Rothwell
pgpPLaHjEtj3v.pgp
Description: OpenPGP digital signature
ntal patch.
Thank you both.
--
Cheers,
Stephen Rothwell
pgp9afw9E75O2.pgp
Description: OpenPGP digital signature
.endm
.macro RDPID opd
REG_TYPE rdpid_opd_type \opd
.if rdpid_opd_type == REG_TYPE_R64
R64_NUM rdpid_opd \opd
.else
R32_NUM rdpid_opd \opd
.endif
.byte 0xf3
.if rdpid_opd > 7
PFX_REX rdpid_opd 0
.endif
.byte 0x0f
merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/crypto/ccp/sev-dev.c
index a2426334be61,aa576529283b..
--- a/drivers/crypto/ccp/sev-dev.c
+++
rmat='Fixes: %h ("%s")'
Fixes: 76a2b524a4b1 ("crypto: ccp: Implement SEV_PDH_CERT_EXPORT ioctl command")
--
Cheers,
Stephen Rothwell
pgpHhFBsoxCEI.pgp
Description: OpenPGP digital signature
or merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgpXBCCQv3WOU.pgp
Description: OpenPGP digital signature
is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgprFvauYBMw4.pgp
Description: OpenPGP digital signature
exist
Did you mean
Fixes: 51e002e949d4 ("crypto: caam - simplfy clock initialization")
--
Cheers,
Stephen Rothwell
pgpTjAEu9OBmB.pgp
Description: OpenPGP digital signature
to: sha256 - Make lib/crypto/sha256.c suitable for generic
use")
--
Cheers,
Stephen Rothwell
pgppXUW2liAS8.pgp
Description: OpenPGP digital signature
You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/purgatory/Makefile
index 8901a1f89cf5,ea86982aba27..
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purg
~~~~~~~~~
This latter from commit
dfed0098ab91 ("crypto: hisilicon - add hardware SGL support")
I have disabled CRYPTO_DEV_HISI_ZIP for now. You should not select
CONFIG options that have dependencies (without also depending on the
same things and being very careful).
--
Cheers,
Stephen Rothwell
pgpG32NcUYQTL.pgp
Description: OpenPGP digital signature
opy of mmotm (it
was actually commit 026f20c65973 since Andrew did another release
yesterday).
--
Cheers,
Stephen Rothwell
pgpm6Q2R9VGFx.pgp
Description: OpenPGP digital signature
Hi Herbert,
On Sat, 11 Feb 2017 18:56:21 +0800 Herbert Xu
wrote:
>
> On Fri, Feb 10, 2017 at 02:12:51PM +1100, Stephen Rothwell wrote:
> >
> > I am still getting these warnings ... I have seen no updates to the
> > crypot tree since Feb 2.
>
> Sorry Stephen. I
Hi Herbert,
On Mon, 6 Feb 2017 17:03:40 +0800 Herbert Xu
wrote:
>
> On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote:
> >
> > After merging the crypto tree, today's linux-next build (x86_64
> > allmodconfig) produced these warnings:
> >
>
Hi Ted,
On Mon, 25 Jul 2016 10:24:07 -0400 Theodore Ts'o wrote:
>
> On Mon, Jul 25, 2016 at 05:15:15PM +1000, Stephen Rothwell wrote:
> >
> > Should I reinstate the random tree to linux-next?
>
> Yes, please do. It was getting zero-day checks, and I assumed it
next since the random tree was
dropped in March because it had not been updated for more than a year at
that point.
However, at least half of these look like bug fixes (cced to stable).
Should I reinstate the random tree to linux-next?
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list:
Hi Paulo,
On Wed, 13 Jul 2016 10:34:27 -0300 Paulo Flabiano Smorigo
wrote:
>
> Wed, Jul 13, 2016 at 01:05:03PM +1000, Stewart Smith wrote:
> > Stephen Rothwell writes:
> > > On Mon, 11 Jul 2016 16:07:39 -0300 Paulo Flabiano Smorigo
> > > wrote:
> > &
can obtain a copy
> +# in the file LICENSE in the source distribution or at
> +# https://www.openssl.org/source/license.html
So, I assume that this license is compatible with the GPLv2?
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-cryp
today (probably a better name could
be chosen):
From: Stephen Rothwell
Date: Fri, 24 Jun 2016 16:13:37 +1000
Subject: [PATCH] crypto: make ecdh_shared_secret unique
There is another ecdh_shared_secret in net/bluetooth/ecc.c
Fixes: 3c4b23901a0c ("crypto: ecdh - Add ECDH software suppor
by: Guenter Roeck
> Signed-off-by: Herbert Xu
Also added into linux-next today.
I am assuming that they will turn up in the crypto tree soon(ish).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpcAYAwdzMS1.pgp
Description: OpenPGP digital signature
rationale for the
> functions chosen to be compiled without optimizations.
>
> Signed-off-by: Stephan Mueller
I will add this as a fix patch to the crypto tree merge today (unless
someone yells at me).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpiEvcYpbw
Hi all,
On Tue, 10 Mar 2015 17:44:54 +1100 Stephen Rothwell
wrote:
>
> On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu
> wrote:
> >
> > On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote:
> > >
> > > After merging the crypto tree, today
Hi Herbert,
On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu
wrote:
>
> On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote:
> >
> > After merging the crypto tree, today's (and the past few days)
> > linux-next build (powerpc allyesconfig) produced th
ey incorrectly
> use the ->update() op, but I'd like to get the changes I have done out
> the door.
I hate to be a pest, but this whole branch has only your signed off by
and no indication that any of it has been reviewed/tested by anyone
else ...
--
Cheers,
Stephen
cores) * 2,
> + (unsigned int)ARRAY_SIZE(drbg_algs));
Doesn't ARRAY_SIZE() always return a size_t? In which case surely we
need no casts, but need to us %zu in the format string.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from
> +{
> + pr_warn("DRBG: no DRBG core was compiled!\n");
> + return -EFAULT;
> +}
> +#else
Wouldn't this be better handled by Kconfig so that we don't even try to
build this unless one of the required core modules is chosen?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
signature.asc
Description: PGP signature
Hi,
On Fri, 26 Apr 2013 14:02:01 +0900 "Chanho Min" wrote:
>
>
> @@ -0,0 +1,23 @@
> +#include
> +
> +int __attribute__((weak)) __clzsi2(int val)
We have __weak in
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp21BCDTqop1.pgp
Description: PGP signature
ave
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current
] %s\n",
> + pr_debug("Unknown OID: [%lu] %s\n",
>(unsigned long)value - ctx->data, buffer);
> }
> return 0;
>
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpmWnHyO5nKw.pgp
Description: PGP signature
now.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgp1UtdD5Z9yP.pgp
Description: PGP signature
Hi Dmitry,
On Mon, 21 Nov 2011 17:32:54 +0200 "Kasatkin, Dmitry"
wrote:
>
> In fact it does not break bisect, because compilation is enabled in
> the 3rd patch.
Ah. sorry, I missed that.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.ca
patch). We generally prefer large patches to be broken up into
logical sub patches rather than just along file boundaries.
In this case, even though it was broken up for review, it could have been
committed as one large commit (assuming that there is no sensible way to
break it up).
--
Ch
Hi Herbert,
On Fri, 21 Oct 2011 10:20:16 +0200 Herbert Xu
wrote:
>
> On Sun, Sep 25, 2011 at 02:50:23PM +1000, Herbert Xu wrote:
> > Stephen Rothwell wrote:
> >
> > > Are you also going to move crypto-curent?
> >
> > I'll create that soon. I'
Are you also going to move crypto-curent?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpxvuIMENMDa.pgp
Description: PGP signature
48 matches
Mail list logo