summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2015-09-08 14:58:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 15:35:28 -0700
commit61e57c0c3a37539e13af03ce68598034d37c7256 (patch)
tree8a0fa75480253ab808a0c285d8f86a57335d9e63 /tools
parent4e4adb2f462889b9eac736dd06d60658beb091b6 (diff)
downloadop-kernel-dev-61e57c0c3a37539e13af03ce68598034d37c7256.zip
op-kernel-dev-61e57c0c3a37539e13af03ce68598034d37c7256.tar.gz
cgroup: fix seq_show_option merge with legacy_name
When seq_show_option (commit a068acf2ee77: "fs: create and use seq_show_option for escaping") was merged, it did not correctly collide with cgroup's addition of legacy_name (commit 3e1d2eed39d8: "cgroup: introduce cgroup_subsys->legacy_name") changes. This fixes the reported name. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud