From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 May 2023 19:25:05 +0000 (-0700)
Subject: Merge tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux
X-Git-Tag: v6.4-rc1~39
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/a1f749de8a610096ca0dd9a40d89c8fa4098c8eb

Merge tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux

Pull arch/csky updates from Guo Ren:

 - Remove CPU_TLB_SIZE config

 - Prevent spurious page faults

* tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux:
  csky: mmu: Prevent spurious page faults
  csky: remove obsolete config CPU_TLB_SIZE
---

a1f749de8a610096ca0dd9a40d89c8fa4098c8eb