From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Aug 2022 20:59:38 +0000 (-0700)
Subject: Merge tag 'for-linus' of github.com:openrisc/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4d5398a3ec060c1e3094097e52a19a4d0013c0e0;p=linux.git

Merge tag 'for-linus' of github.com:openrisc/linux

Pull OpenRISC updates from Stafford Horne:
 "In this cycle we add PCI support to OpenRISC used in our new QEMU virt
  platform.

  The main updates from me include:

   - Kconfig updates to support OpenRISC PCI (just config now after the
     PCI cleanups I did on Bjorn's branch)

   - A new defconfig for the qemu virt platform.

   - Also there is one MAINTAINERS update. As I was working on the PCI
     series we kept getting bounces from Richard's old email address. I
     added this here; I am not sure how these are usually handled when
     the maintainer doesn't queue it themselves"

* tag 'for-linus' of github.com:openrisc/linux:
  openrisc: io: Define iounmap argument as volatile
  MAINTAINERS: Update Richard Henderson's address
  openrisc: Add virt defconfig
  openrisc: Add pci bus support
---

4d5398a3ec060c1e3094097e52a19a4d0013c0e0