summaryrefslogtreecommitdiffstats
path: root/mm/mmap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-13 16:26:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-13 16:26:46 -0700
commit1410b74e4061e05a5d2bffb1f99829efce27c8a9 (patch)
tree728676e29a08aa954eb7f0c9deceacdaa4faf222 /mm/mmap.c
parentda92223908f309d5ba63ce7dd568dfb6a7e5d7d2 (diff)
parent09be4c824ebdbf3c043a07d2d9537a0164a1ecfe (diff)
downloadlinux-1410b74e4061e05a5d2bffb1f99829efce27c8a9.tar.gz
linux-1410b74e4061e05a5d2bffb1f99829efce27c8a9.tar.bz2
linux-1410b74e4061e05a5d2bffb1f99829efce27c8a9.zip
Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: "During v4.6-rc1 cgroup namespace support was merged. There is an issue where it's impossible to tell whether a given cgroup mount point is bind mounted or namespaced. Serge has been working on the issue but it took longer than expected to resolve, so the late pull request. Given that it's a completely new feature and the patches don't touch anything else, the risk seems acceptable. However, if this is too late, an alternative is plugging new cgroup ns creation for v4.6 and retrying for v4.7" * 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: fix compile warning kernfs: kernfs_sop_show_path: don't return 0 after seq_dentry call cgroup, kernfs: make mountinfo show properly scoped path for cgroup namespaces kernfs_path_from_node_locked: don't overwrite nlen
Diffstat (limited to 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions