Merge tag 'arch-cleanup-2020-10-22' of git://git.kernel.dk/linux-block