Merge tag 'parisc-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 May 2023 16:54:38 +0000 (09:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 May 2023 16:54:38 +0000 (09:54 -0700)
commit838a854820eea0d21c6910cc3ab23b78d16aa1dd
tree01a0f98bcb45db2344c391bf2a12fe85d348d4da
parent01bc932561438be3a33d7c7c89be45f866168c5f
parent6f9e98849edaa8aefc4030ff3500e41556e83ff7
Merge tag 'parisc-for-6.4-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:

 - Fix encoding of swp_entry due to added SWP_EXCLUSIVE flag

 - Include reboot.h to avoid gcc-12 compiler warning

* tag 'parisc-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix encoding of swp_entry due to added SWP_EXCLUSIVE flag
  parisc: kexec: include reboot.h