Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

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

diff --cc include/linux/lsm_hook_defs.h
Simple merge

diff --cc include/linux/lsm_hooks.h
Simple merge

diff --cc security/apparmor/Kconfig
Simple merge

diff --cc security/integrity/ima/Kconfig
Simple merge

diff --cc security/integrity/ima/ima_template.c
Simple merge

diff --cc security/integrity/ima/ima_template_lib.c
Simple merge

diff --cc security/keys/encrypted-keys/encrypted.c
Simple merge