]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'for-linus' of https://github.com/openrisc/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2025 15:37:46 +0000 (08:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2025 15:37:46 +0000 (08:37 -0700)
Pull OpenRISC updates from Stafford Horne:

 - Replace __ASSEMBLY__ with __ASSEMBLER__ in headers (Thomas Huth)

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

1  2 
arch/openrisc/include/asm/pgtable.h

Simple merge