Subject: Re: linux-next: build failure after merge of the akpm tree

From: Michal Hocko <[email-masked]>
Date: Wed, 16 Jul 2014 10:54:02 +0200

On Wed 16-07-14 18:26:41, Stephen Rothwell wrote:
> Hi Andrew,
> 
> After merging the akpm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> mm/memcontrol.c:5269:12: error: 'CFTYPE_INSANE' undeclared here (not in a function)
>    .flags = CFTYPE_INSANE,
>             ^
> 
> Caused by commit 8fa6a8baeffc ("memcg: deprecate memory.force_empty
> knob") interacting with commits a8ddc8215e1a ("cgroup: distinguish the
> default and legacy hierarchies when handling cftypes") and 05ebb6e60f04
> ("cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup
> core") from the cgroup tree.
>
> I applied the following fix up patch:

This basically means dropping the page from Andrew's tree after the
above cgroups changes. I am sorry but I was really busy last few weeks
so I didn't follow cgroups changes closely. I will post a patch that
deals with the dfl hierarchy.

> From: Stephen Rothwell <[email-masked]>
> Date: Wed, 16 Jul 2014 18:20:59 +1000
> Subject: [PATCH] memcg-deprecate-memoryforce_empty-knob-fix2
> 
> Signed-off-by: Stephen Rothwell <[email-masked]>
> ---
>  mm/memcontrol.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 8fa6602a32cd..e1c9699b157b 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -5266,7 +5266,6 @@ static struct cftype mem_cgroup_files[] = {
>  	},
>  	{
>  		.name = "force_empty",
> -		.flags = CFTYPE_INSANE,
>  		.write = mem_cgroup_force_empty_write,
>  	},
>  	{
> -- 
> 2.0.1
> 
> 
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]

-- 
Michal Hocko
SUSE Labs