On Tue, Jul 25, 2023 at 09:25:46PM -0400, Sasha Levin wrote: > On Tue, Jul 25, 2023 at 09:13:43AM -0700, Eric Biggers wrote: > > On Tue, Jul 25, 2023 at 12:44:26PM +0200, Greg Kroah-Hartman wrote: > > > From: Eric Biggers <ebiggers@xxxxxxxxxx> > > > > > > [ Upstream commit d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca ] > > > > > > crypto_has_skcipher() and crypto_has_skcipher2() do the same thing: they > > > check for the availability of an algorithm of type skcipher, blkcipher, > > > or ablkcipher, which also meets any non-type constraints the caller > > > specified. And they have exactly the same prototype. > > > > > > Therefore, eliminate the redundancy by removing crypto_has_skcipher() > > > and renaming crypto_has_skcipher2() to crypto_has_skcipher(). > > > > > > Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> > > > Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> > > > Stable-dep-of: efbc7764c444 ("crypto: marvell/cesa - Fix type mismatch warning") > > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > --- > > > crypto/skcipher.c | 4 ++-- > > > include/crypto/skcipher.h | 19 +------------------ > > > 2 files changed, 3 insertions(+), 20 deletions(-) > > > > How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"? > > > > I don't understand why this is being backported. > > You're right - it's not a dep on 5.15 but rather on 5.4, and my failed > optimization attempt did the wrong thing here. Sorry. > I don't see why it would be a dependency on any version. - Eric