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)
commit4853c74bd7ab7fdb83f319bd9ace8a08c031e9b6
treeff4072d9b6964ee16857ad57dde357afe54e477e
parent2d7b8c6b90e4054a35eb59cd6d7c66e903e8ae4b
parent7a894c87374771f3cfb1b8e5453fbe03f1fb8135
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