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@xxxxxxxxxxxxxxxx
Attachment:
pgpMNSKVU235x.pgp
Description: PGP signature
