Merge branch 'for-4.3/core' of git://git.kernel.dk/linux-block