Merge branch 'for-4.12/post-merge' of git://git.kernel.dk/linux-block