| commit | 1e5a2b1fbb41c619c1abbe9b853269d3d932cdf1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 14 Jul 2017 19:42:07 +0000 (14 12:42 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 14 Jul 2017 19:42:07 +0000 (14 12:42 -0700) | ||
| tree | ceafbdfb6af0aa3e17cb166cde17f9dc98c0443f | treesnapshot (tar.gz zip) |
| parent | 1430858fa827e0c11921f26f429ccf22188d4a56 | commitdiff |
| parent | 7228b66aaf723a623e578aa4db7d083bb39546c9 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security
Pull key handling fixes from James Morris:
"A minor fix and documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Add documentation for asymmetric keyring restrictions
KEYS: DH: validate __spare field
modsign: add markers to endif-statements in certs/Makefile
Pull key handling fixes from James Morris:
"A minor fix and documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Add documentation for asymmetric keyring restrictions
KEYS: DH: validate __spare field
modsign: add markers to endif-statements in certs/Makefile