Merge branch '3.10/fb-mmap' into for-next