From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Mar 2025 02:26:10 +0000 (-0700)
Subject: Merge tag 'livepatching-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.15-rc1~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf9f31c62b3d31c033ee5bce522855c3d7f56b1;p=thirdparty%2Flinux.git

Merge tag 'livepatching-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching updates from Petr Mladek:

 - Add a selftest for tracing of a livepatched function

 - Skip a selftest when kprobes are not using ftrace

 - Some documentation clean up

* tag 'livepatching-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  selftests: livepatch: test if ftrace can trace a livepatched function
  selftests: livepatch: add new ftrace helpers functions
  selftest/livepatch: Only run test-kprobe with CONFIG_KPROBES_ON_FTRACE
  docs: livepatch: move text out of code block
  livepatch: Add comment to clarify klp_add_nops()
---

dcf9f31c62b3d31c033ee5bce522855c3d7f56b1