Merge tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2025 03:17:29 +0000 (12:17 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2025 03:17:29 +0000 (12:17 +0900)
commit565848bb3bcdf166fd3ff982376b30806eec0180
tree9274111c64637ceb21b714f26367cf2132a96a99
parentc9b47175e9131118e6f221cc8fb81397d62e7c91
parent817d21578d51e801df58ab012654486a71073074
Merge tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux

Pull csky updates from Guo Ren:

 - Remove compile warning for CONFIG_SMP

 - Fix __ASSEMBLER__ typo in headers

 - Fix csky_cmpxchg_fixup

* tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux:
  csky: Remove compile warning for CONFIG_SMP
  csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi header
  csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  csky: fix csky_cmpxchg_fixup not working