On Thu, 31 May 2012 18:24:51 +1000 Stephen Rothwell [off-list ref] wrote:

quoted

On Thu, May 31, 2012 at 02:13:29PM +1000, Stephen Rothwell wrote:

quoted

Today's linux-next merge of the akpm tree got a conflict in
mm/memcontrol.c between commit 78ccf5b5ab83 ("mm: memcg: print statistics
directly to seq_file") and others from Linus' tree and commit "memcg: add
mlock statistic in memory.stat" from the akpm tree.

I just dropped the akpm patch for now.

...

I will remove that patch tomorrow in any case.

I should actually read my email - I already did remove it. :-)

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