From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2025 03:17:29 +0000 (+0900)
Subject: Merge tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=565848bb3bcdf166fd3ff982376b30806eec0180;p=thirdparty%2Flinux.git

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
---

565848bb3bcdf166fd3ff982376b30806eec0180