From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2026 20:12:00 +0000 (-0700)
Subject: Merge tag 'trace-rtla-v7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v7.0-rc7~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1b24d8bdd64ecd5400dff79677f8a290ca70d73;p=thirdparty%2Flinux.git

Merge tag 'trace-rtla-v7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull rtla build fix from Steven Rostedt:

 - Fix build failure when libbpf does not exist

   RTLA supports building without BPF libraries, but a recent change
   added a libbpf.h include outside of the BPF protection which caused
   build failures when libbpf was not installed.

* tag 'trace-rtla-v7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  rtla: Fix build without libbpf header
---

f1b24d8bdd64ecd5400dff79677f8a290ca70d73