Messages in this thread | | | Date | Mon, 10 Dec 2012 18:47:49 +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/huge_memory.c between various commits from the tip tree and commit "thp: fix update_mmu_cache_pmd() calls" from the akpm tree.
It appears that the shed/numa patches in the tip tree have been changed in today's version of the tip tree and this akpm tree patch no longer applies.
I dropped the akpm tree patch and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |