Messages in this thread | | | Date | Thu, 31 May 2012 14:13:29 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
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 [unhandled content-type:application/pgp-signature] | |