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)
commit995b406c7e972fab181a4bb57f3b95e59b8e5bf3
tree438258e6d7fadbb73120b1f6e53f11f641d6c2c9
parentdfab92f27c600fea3cadc6e2cb39f092024e1fef
parentdd64621a2a97798d5df40028238a703d4324036b
Merge tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux

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