From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Jul 2023 04:12:32 +0000 (-0700)
Subject: Merge tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux
X-Git-Tag: ceph-for-6.5-rc2~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=995b406c7e972fab181a4bb57f3b95e59b8e5bf3;p=ceph-client.git

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

995b406c7e972fab181a4bb57f3b95e59b8e5bf3