From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jan 2025 19:52:59 +0000 (-0800)
Subject: Merge tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.14-rc1~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47d65738b9752d6bf0ed694c3c829a06a1c460ac;p=thirdparty%2Flinux.git

Merge tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture updates from Helge Deller:

 - Temporarily disable jump label support to avoid kernel crash with
   32-bit kernel

 - Add vdso linker script to 'targets' instead of extra-y

 - Remove parisc versions of memcpy_toio and memset_io

* tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Temporarily disable jump label support
  parisc: add vdso linker script to 'targets' instead of extra-y
  parisc: Remove memcpy_toio and memset_io
---

47d65738b9752d6bf0ed694c3c829a06a1c460ac