summaryrefslogtreecommitdiff
path: root/security/apparmor/include/file.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-07 21:11:41 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-07 21:11:41 +0300
commit1fc1cd8399ab5541a488a7e47b2f21537dd76c2d (patch)
tree8096fd360f6746e6f7c852a7f070fa1bf6f93266 /security/apparmor/include/file.h
parentabf7c3d8ddea3b43fe758590791878e1fd88ac47 (diff)
parent6a613d24effcb875271b8a1c510172e2d6eaaee8 (diff)
downloadlinux-1fc1cd8399ab5541a488a7e47b2f21537dd76c2d.tar.xz
Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: - Oleg's pids controller accounting update which gets rid of rcu delay in pids accounting updates - rstat (cgroup hierarchical stat collection mechanism) optimization - Doc updates * 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cpuset: remove unused task_has_mempolicy() cgroup, rstat: Don't flush subtree root unless necessary cgroup: add documentation for pids.events file Documentation: cgroup-v2: eliminate markup warnings MAINTAINERS: Update cgroup entry cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
Diffstat (limited to 'security/apparmor/include/file.h')
0 files changed, 0 insertions, 0 deletions