Merge branch 'vfs-for-3.16' of git://git.infradead.org/users/hch/vfs