Merge tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs