diff options
| author | Linus Torvalds | 2018-04-08 01:44:33 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-08 01:44:33 +0200 |
| commit | 706ffc8c26432432fcd6d8a02708b40852bd0bd2 (patch) | |
| tree | e09278fdedc2dfdeb93ef2bc773d18205d34a74f /drivers/char/tpm/tpm2-cmd.c | |
| parent | Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| parent | Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into ... (diff) | |
| download | kernel-qcow2-linux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.tar.gz kernel-qcow2-linux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.tar.xz kernel-qcow2-linux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.zip | |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack update from James Morris:
"One small change for Automotive Grade Linux"
* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Smack: Handle CGROUP2 in the same way that CGROUP
Diffstat (limited to 'drivers/char/tpm/tpm2-cmd.c')
0 files changed, 0 insertions, 0 deletions