summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/segment.h
diff options
context:
space:
mode:
authorLinus Torvalds2018-10-25 22:29:51 +0200
committerLinus Torvalds2018-10-25 22:29:51 +0200
commite80bc229691a4f601a2476e07cbdf08a289a2ad6 (patch)
treecb00f0bf7888470004fa18bfcff803da31a2a01e /fs/f2fs/segment.h
parentMerge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor... (diff)
parentMerge branch 'smack-for-4.20' of https://github.com/cschaufler/next-smack int... (diff)
downloadkernel-qcow2-linux-e80bc229691a4f601a2476e07cbdf08a289a2ad6.tar.gz
kernel-qcow2-linux-e80bc229691a4f601a2476e07cbdf08a289a2ad6.tar.xz
kernel-qcow2-linux-e80bc229691a4f601a2476e07cbdf08a289a2ad6.zip
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack updates from James Morris: "From Casey: three patches for Smack for 4.20. Two clean up warnings and one is a rarely encountered ptrace capability check" * 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Smack: Mark expected switch fall-through Smack: ptrace capability use fixes Smack: remove set but not used variable 'root_inode'
Diffstat (limited to 'fs/f2fs/segment.h')
0 files changed, 0 insertions, 0 deletions