Hi Johannes,

On Thu, 31 May 2012 09:25:05 +0200 Johannes Weiner [off-list ref] wrote:

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.

Thanks, Stephen.

However, the patch is known to be broken and, according to mm-commits,
was removed from -mm on May 16 already.  How'd it reappear?

Andrew only send me a new set of patches at irregular intervals, in this
case the last set arrived on May 10/11.  I just keep rebasing the patches
until Andrew sends me a new set (Andrew: big hint :-)).

I will remove that patch tomorrow in any case.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au