diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
| commit | 50d4fb1dc129955ab571c1dd7bf14cd07cc5984d (patch) | |
| tree | e7667ecbd53d3985d294ea7ee64e33f9523cedff /crypto/sm3_generic.c | |
| parent | 4ac44d603f290242cbba2e0d0383460412d55c04 (diff) | |
| parent | a41bb691f04fcf6d3fa1f6e743d1520e305bc71d (diff) | |
| download | linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.tar.gz linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.zip | |
Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Sync with upstream (which now contains fbdev-v4.19 changes) to
prepare a base for fbdev-v4.20 changes.
Diffstat (limited to 'crypto/sm3_generic.c')
| -rw-r--r-- | crypto/sm3_generic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c index 9e823d99..9a5c60f0 100644 --- a/crypto/sm3_generic.c +++ b/crypto/sm3_generic.c @@ -184,7 +184,6 @@ static struct shash_alg sm3_alg = { .base = { .cra_name = "sm3", .cra_driver_name = "sm3-generic", - .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = SM3_BLOCK_SIZE, .cra_module = THIS_MODULE, } |