From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Aug 2023 20:28:04 +0000 (+0000)
Subject: Merge tag 'parisc-for-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/delle... 
X-Git-Tag: v6.6.7~2186
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4853c74bd7ab7fdb83f319bd9ace8a08c031e9b6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'parisc-for-6.5-rc7' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fix from Helge Deller:
 "Fix the parisc TLB ptlock checks so that they can be enabled together
  with the lightweight spinlock checks"

* tag 'parisc-for-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix CONFIG_TLB_PTLOCK to work with lightweight spinlock checks
---

4853c74bd7ab7fdb83f319bd9ace8a08c031e9b6