The patch titled
Subject: cgroup: fix seq_show_option merge with legacy_name
has been added to the -mm tree. Its filename is
cgroup-fix-seq_show_option-merge-with-legacy_name.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/cgroup-fix-seq_show_option-merge-with-legacy_name.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/cgroup-fix-seq_show_option-merge-with-legacy_name.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: cgroup: fix seq_show_option merge with legacy_name
When seq_show_option (068acf2ee776) was merged, it did not correctly
collide with cgroup's addition of legacy_name (3e1d2eed39d8) changes.
This fixes the reported name.
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cgroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/cgroup.c~cgroup-fix-seq_show_option-merge-with-legacy_name kernel/cgroup.c
--- a/kernel/cgroup.c~cgroup-fix-seq_show_option-merge-with-legacy_name
+++ a/kernel/cgroup.c
@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct se
if (root != &cgrp_dfl_root)
for_each_subsys(ss, ssid)
if (root->subsys_mask & (1 << ssid))
- seq_show_option(seq, ss->name, NULL);
+ seq_show_option(seq, ss->legacy_name, NULL);
if (root->flags & CGRP_ROOT_NOPREFIX)
seq_puts(seq, ",noprefix");
if (root->flags & CGRP_ROOT_XATTR)
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
cgroup-fix-seq_show_option-merge-with-legacy_name.patch
lib-string_helpers-clarify-esc-arg-in-string_escape_mem.patch
lib-string_helpers-rename-esc-arg-to-only.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
