diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 12:54:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 12:54:40 -0700 |
| commit | 7664cd6e3a0b2709f04c07435e96c7c85e7d7324 (patch) | |
| tree | d270574b311da6e449ad6dcea0bfc16e13d5aa78 /Documentation/hid | |
| parent | 882388056194d2d4c3f589b194b6bdcc47e677e8 (diff) | |
| parent | 2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d (diff) | |
| download | linux-7664cd6e3a0b2709f04c07435e96c7c85e7d7324.tar.bz2 | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull intgrity updates from James Morris:
"This contains just three patches, the remainder were either included
in other pull requests (eg. audit, lockdown) or will be upstreamed via
other subsystems (eg. kselftests, Power).
Included here is one bug fix, one documentation update, and extending
the x86 IMA arch policy rules to coordinate the different kernel
module signature verification methods"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
doc/kernel-parameters.txt: Deprecate ima_appraise_tcb
x86/ima: add missing include
x86/ima: require signed kernel modules
Diffstat (limited to 'Documentation/hid')
0 files changed, 0 insertions, 0 deletions