Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jul 2017 19:42:07 +0000 (12:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jul 2017 19:42:07 +0000 (12:42 -0700)
commit1e5a2b1fbb41c619c1abbe9b853269d3d932cdf1
treeceafbdfb6af0aa3e17cb166cde17f9dc98c0443f
parent1430858fa827e0c11921f26f429ccf22188d4a56
parent7228b66aaf723a623e578aa4db7d083bb39546c9
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