linux-kernel - linux-next: manual merge of the akpm-current tree with the cgroup tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 19 Aug 2015 18:43:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kees Cook <keescook@...omium.org>
Subject: linux-next: manual merge of the akpm-current tree with the cgroup
 tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  kernel/cgroup.c

between commit:

  d98817d4961b ("cgroup: don't print subsystems for the default hierarchy")
  3e1d2eed39d8 ("cgroup: introduce cgroup_subsys->legacy_name")

from the cgroup tree and commit:

  04b6d1bfdd24 ("fs: create and use seq_show_option for escaping")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/cgroup.c
index f3f5cd5e2c0d,c6c4240e7d28..000000000000
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -1339,10 -1332,9 +1339,10 @@@ static int cgroup_show_options(struct s
  	struct cgroup_subsys *ss;
  	int ssid;
  
 -	for_each_subsys(ss, ssid)
 -		if (root->subsys_mask & (1 << ssid))
 -			seq_show_option(seq, ss->name, NULL);
 +	if (root != &cgrp_dfl_root)
 +		for_each_subsys(ss, ssid)
 +			if (root->subsys_mask & (1 << ssid))
- 				seq_printf(seq, ",%s", ss->legacy_name);
++				seq_show_option(seq, ss->legacy_name, NULL);
  	if (root->flags & CGRP_ROOT_NOPREFIX)
  		seq_puts(seq, ",noprefix");
  	if (root->flags & CGRP_ROOT_XATTR)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/