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