Merge tag 'for-linus' of https://github.com/openrisc/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Mar 2024 22:53:10 +0000 (15:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Mar 2024 22:53:10 +0000 (15:53 -0700)
commit29da654bd20842d4c1e17c6d4dc1b12642ca16ac
tree644b9ead916c8814f1e87a059882a35504c9e127
parent6d75c6f40a03c97e1ecd683ae54e249abb9d922b
parent7f1e2fc493480086fbb375f4f6d33cb93fc069d6
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