From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Sep 2019 20:46:44 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://github.com/openrisc/linux
X-Git-Tag: v5.4-rc1~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e24aaabdee9e07f19b09bd305ffc069b0b07371;p=thirdparty%2Fkernel%2Flinux.git

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

Pull OpenRISC updates from Stafford Horne:
 "Few small things for 5.4:

   - Fixup ethoc ethernet device tree descriptors which were previously
     broken, now ethernet works on FPGAs running OpenRISC!

   - Switch ioremap to use uncached semantics - from Christoph Hellwig"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: map as uncached in ioremap
  or1k: dts: Add ethoc device to SMP devicetree
  or1k: dts: Fix ethoc network configuration in or1ksim devicetree
---

1e24aaabdee9e07f19b09bd305ffc069b0b07371