From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Oct 2021 16:12:18 +0000 (-0700)
Subject: Merge tag 'csky-for-linus-5.15-rc6' of git://github.com/c-sky/csky-linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c13f946bf1ef0eef49748b1824a0bdfb3487fe8c;p=linux.git

Merge tag 'csky-for-linus-5.15-rc6' of git://github.com/c-sky/csky-linux

Pull csky fixes from Guo Ren:
 "Only 5 fixups:

   - Make HAVE_TCM depend on !COMPILE_TEST

   - bitops: Remove duplicate __clear_bit define

   - Select ARCH_WANT_FRAME_POINTERS only if compiler supports it

   - Fixup regs.sr broken in ptrace

   - don't let sigreturn play with priveleged bits of status register"

* tag 'csky-for-linus-5.15-rc6' of git://github.com/c-sky/csky-linux:
  csky: Make HAVE_TCM depend on !COMPILE_TEST
  csky: bitops: Remove duplicate __clear_bit define
  csky: Select ARCH_WANT_FRAME_POINTERS only if compiler supports it
  csky: Fixup regs.sr broken in ptrace
  csky: don't let sigreturn play with priveleged bits of status register
---

c13f946bf1ef0eef49748b1824a0bdfb3487fe8c