summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 22:32:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 22:32:00 +0200
commit24ed334f33666f2ae929ccc08f72e7e72e353c64 (patch)
tree524e52a9bf9b548bbb4c29d64ebd01603f9483d9 /drivers/block
parentMerge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm... (diff)
parentMerge tag 'loadpin-security-next' of https://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-24ed334f33666f2ae929ccc08f72e7e72e353c64.tar.xz
linux-24ed334f33666f2ae929ccc08f72e7e72e353c64.zip
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/block')
0 files changed, 0 insertions, 0 deletions