Messages in this thread | | | Date | Mon, 10 Dec 2012 19:20:05 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/mempolicy.c between commit d9f1eb872704 ("numa, mempolicy: Improve CONFIG_NUMA_BALANCING=y OOM behavior") from the tip tree and commit "mm, mempolicy: remove duplicate code" from the akpm tree.
I can't tell if the akpm tree patch is still relevant, so I dropped it.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |