Merge branch 'cleanup/blocksize-diet-part2' of git://git.kernel.org/pub/scm/linux...