diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:32:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:32:00 -0700 |
| commit | 24ed334f33666f2ae929ccc08f72e7e72e353c64 (patch) | |
| tree | 524e52a9bf9b548bbb4c29d64ebd01603f9483d9 /drivers/crypto/chelsio/chcr_crypto.h | |
| parent | e80bc229691a4f601a2476e07cbdf08a289a2ad6 (diff) | |
| parent | 85a585918fb4122ad26b6febaec5c3c90bf2535c (diff) | |
Merge branch 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull LoadPin updates from James Morris:
"From Kees: This is a small reporting improvement and the param change
needed for the ordering series (but since the loadpin change is
desired and separable, I'm putting it here)"
* 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
LoadPin: Rename boot param "enabled" to "enforce"
LoadPin: Report friendly block device name
Diffstat (limited to 'drivers/crypto/chelsio/chcr_crypto.h')
0 files changed, 0 insertions, 0 deletions