Merge tag 'parisc-for-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/delle...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Aug 2023 20:28:04 +0000 (20:28 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Aug 2023 20:28:04 +0000 (20:28 +0000)
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


Trivial merge