From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2022 20:47:42 +0000 (-0700)
Subject: Merge tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.1-rc1~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73344a3f6793d6b5384077be1e5ce6b90bbcaeb4;p=users%2Fdwmw2%2Flinux.git

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
---

73344a3f6793d6b5384077be1e5ce6b90bbcaeb4