From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Sep 2021 18:03:00 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://github.com/openrisc/linux
X-Git-Tag: microblaze-v5.16~104
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=603eefda5fcf8f9dab3ae253e677abb285f6f3bc

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

Pull OpenRISC updates from Stafford Horne:
 "A few cleanups and compiler warning fixes for OpenRISC.

  Also, this includes dts and defconfig updates to enable Ethernet on
  OpenRISC/Litex FPGA SoC's now that the LiteEth driver has gone
  upstream"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc/litex: Update defconfig
  openrisc/litex: Add ethernet device
  openrisc/litex: Update uart address
  openrisc: Fix compiler warnings in setup
  openrisc: rename or32 code & comments to or1k
  openrisc: don't printk() unconditionally
---

603eefda5fcf8f9dab3ae253e677abb285f6f3bc