summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 00:09:47 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 00:09:47 +0100
commit13ddd1667e7f01071cdf120132238ffca004a88e (patch)
tree6cd3cae74cc6a7e9d5e5292600623c8533a3fa7c /security/apparmor
parentMerge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/p... (diff)
parentDocumentation: Fix 'file_mapped' -> 'mapped_file' (diff)
downloadlinux-13ddd1667e7f01071cdf120132238ffca004a88e.tar.xz
linux-13ddd1667e7f01071cdf120132238ffca004a88e.zip
Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: "Nothing too interesting. Documentation updates and trivial changes; however, this pull request does containt he previusly discussed dropping of __must_check from strscpy()" * 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: Documentation: Fix 'file_mapped' -> 'mapped_file' string: drop __must_check from strscpy() and restore strscpy() usages in cgroup cgroup, docs: document the root cgroup behavior of cpu and io controllers cgroup-v2.txt: fix typos cgroup: Update documentation reference Documentation/cgroup-v1: fix outdated programming details cgroup, docs: document cgroup v2 device controller
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions