Merge tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2023 04:12:32 +0000 (21:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2023 04:12:32 +0000 (21:12 -0700)
Pull arch/csky update from Guo Ren:

 - Correct thread.trap_no restore of uprobe

* tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux:
  csky: uprobes: Restore thread.trap_no


Trivial merge