diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 02:15:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 02:15:16 +0300 |
| commit | ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61 (patch) | |
| tree | b200c91bc4e77bb62163dde440791298b4137428 /.gitattributes | |
| parent | ca7e1fd1026c5af6a533b4b5447e1d2f153e28f2 (diff) | |
| parent | 5780b9abd530982c2bb1018e2c52c05ab3c30b45 (diff) | |
| download | linux-ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61.tar.xz | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull IMA fixes from Mimi Zohar:
"Two bug fixes and an associated change for each.
The one that adds SM3 to the IMA list of supported hash algorithms is
a simple change, but could be considered a new feature"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
ima: add sm3 algorithm to hash algorithm configuration list
crypto: rename sm3-256 to sm3 in hash_algo_name
efi: Only print errors about failing to get certs if EFI vars are found
x86/ima: use correct identifier for SetupMode variable
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions