Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Aug 2020 21:30:36 +0000 (14:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Aug 2020 21:30:36 +0000 (14:30 -0700)
Pull security subsystem updates from James Morris:
 "A couple of minor documentation updates only for this release"

* tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  LSM: drop duplicated words in header file comments
  Replace HTTP links with HTTPS ones: security

1  2 
include/linux/lsm_hook_defs.h
include/linux/lsm_hooks.h
security/apparmor/Kconfig
security/integrity/ima/Kconfig
security/integrity/ima/ima_template.c
security/integrity/ima/ima_template_lib.c
security/keys/encrypted-keys/encrypted.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge