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

From: Tejun Heo <[email-masked]>
Date: Wed, 14 May 2014 17:57:07 -0400

Hello,

On Wed, May 14, 2014 at 02:55:20PM -0700, Andrew Morton wrote:
> > @@ -6026,7 +6026,7 @@ static struct cftype mem_cgroup_files[] = {
> >  	{
> >  		.name = "low_limit_in_bytes",
> >  		.private = MEMFILE_PRIVATE(_MEM, RES_LOW_LIMIT),
> > -		.write_string = mem_cgroup_write,
> > +		.write = mem_cgroup_write,
> >  		.read_u64 = mem_cgroup_read_u64,
> >  	},
> 
> Renaming buffer to buf was rather unneeded.
> 
> I have 24 patches here against mm/memcontrol.c.  Go gently, please.

Yeah, sorry about that.  That conflict wasn't necessary.

Thanks.

-- 
tejun