Merge tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fix from Arnd Bergmann:
"A last-minute arch/alpha regression fix: the previous asm-generic
branch contained a new regression from a typo"

* tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
alpha: fix marvel_ioread8 build regression

+1 -1
+1 -1
arch/alpha/kernel/core_marvel.c
··· 803 803 return (void __iomem *)addr; 804 804 } 805 805 806 - unsigned u8 806 + u8 807 807 marvel_ioread8(const void __iomem *xaddr) 808 808 { 809 809 unsigned long addr = (unsigned long) xaddr;