Merge branch 'for-4.11/block' into for-4.11/linus-merge