]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b4717 817d215)
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)
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


Trivial merge
A mirror of Linus' kernel repository