linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2012-05-31T04:13:39Z

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

Hi Andrew,

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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]