From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2024 22:49:20 +0000 (-0800)
Subject: Merge tag 'parisc-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.13-rc1~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9160b68e0cf8d57243f17debcb564ce01e327ada;p=thirdparty%2Fkernel%2Flinux.git

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

Pull parisc architecture update from Helge Deller:

 - Fix function graph tracing disablement on parisc

* tag 'parisc-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc/ftrace: Fix function graph tracing disablement
---

9160b68e0cf8d57243f17debcb564ce01e327ada