From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Nov 2023 19:05:31 +0000 (-0800)
Subject: Merge tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.7-rc1~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b57b17e88bf58860dad312d08db7d6708ee6d06d;p=linux-2.6-block.git

Merge tag 'parisc-for-6.7-rc1-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:

 - Include the upper 5 address bits when inserting TLB entries on a
   64-bit kernel.

   On physical machines those are ignored, but in qemu it's nice to have
   them included and to be correct.

 - Stop the 64-bit kernel and show a warning if someone tries to boot on
   a machine with a 32-bit CPU

 - Fix a "no previous prototype" warning in parport-gsc

* tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Prevent booting 64-bit kernels on PA1.x machines
  parport: gsc: mark init function static
  parisc/pgtable: Do not drop upper 5 address bits of physical address
---

b57b17e88bf58860dad312d08db7d6708ee6d06d