Hi Dave, upstream removed the PAGE_CACHE_* macros in 4.6-rc3, which will cause all kinds of interesting conflicts for FS work. Maybe it's a good idea to rebase for-next ontop of -rc3 so that we can sort this out early?