tree 4ac9929a130cded36b50788c3d7bcfc2d4ec202d
parent 4eeee6636af819454d7c43702e77ec7857a63000
parent a406b8b424fa01f244c1aab02ba186258448c36b
author Linus Torvalds <torvalds@linux-foundation.org> 1699815931 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1699815931 -0800
mergetag object a406b8b424fa01f244c1aab02ba186258448c36b
 type commit
 tag parisc-for-6.7-rc1-2
 tagger Helge Deller <deller@gmx.de> 1699771609 +0100
 
 parisc architecture fixes for kernel v6.7-rc1 (part 2):
 
 - Include upper 5 address bits of physical address in iitlbp
 - Prevent booting 64-bit kernels on PA1.x machines
 - parport-gsc: mark init function static
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZVB1AgAKCRD3ErUQojoP
 Xy+GAP0TlgE7ExHBB4jBpGf6uFuP0broznCeclPD4Bd0gngVhQEAz5v5m0FkJVVI
 5nOlKbBzLU4Mt9WYEbqNhmoNrklvYQo=
 =T1IA
 -----END PGP SIGNATURE-----

Merge tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/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