From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Mar 2024 22:53:10 +0000 (-0700)
Subject: Merge tag 'for-linus' of https://github.com/openrisc/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29da654bd20842d4c1e17c6d4dc1b12642ca16ac;p=users%2Fjedix%2Flinux-maple.git

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

Pull OpenRISC updates from Stafford Horne:
 "Just a few cleanups and updates that were sent in:

   - Replace asm/fixmap.h with asm-generic version

   - Fix to move memblock setup up before it's used during init"

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Use asm-generic's version of fix_to_virt() & virt_to_fix()
  openrisc: Call setup_memory() earlier in the init sequence
---

29da654bd20842d4c1e17c6d4dc1b12642ca16ac