From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Jan 2021 00:39:36 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://github.com/openrisc/linux
X-Git-Tag: nvme-5.12-2021-03-04~289
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=03e319e5465a2da6fb188c77043775f2888df529;p=nvme.git

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

Pull OpenRISC fix from Stafford Horne:
 "Fix config dependencies for Litex SOC driver causing issues on um"

* tag 'for-linus' of git://github.com/openrisc/linux:
  soc: litex: Properly depend on HAS_IOMEM
---

03e319e5465a2da6fb188c77043775f2888df529