Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/x86/mm/hugetlbpage.c between commit 097d59106a8e ("vm: avoid using find_vma_prev() unnecessarily") from Linus' tree and commit "hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()" from the akpm tree. I think the latter is a superset of the former, so I just dropped the changes from the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au