Merge tag 'upstream-3.18-rc1-v2' of git://git.infradead.org/linux-ubifs