FAILED: patch "[PATCH] perf build: Include generated header files properly" failed to apply to 6.1-stable tree

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x c7e97f215a4ad634b746804679f5937d25f77e29
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023091643-immobile-voltage-9c80@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

c7e97f215a4a ("perf build: Include generated header files properly") 3d88aec0d42e ("perf pmu: Make parser reentrant")
e293a5e816c0 ("perf pmu: Use relative path for sysfs scan") eec1131091c8 ("perf pmu: Add perf_pmu__destroy() function") 990a71e904f6 ("perf bpf filter: Introduce basic BPF filter expression") 16cad1d3597d ("perf lock contention: Use lock_stat_find{,new}") 492fef218a66 ("perf lock contention: Factor out lock_contention_get_name()") d50a79cd0f39 ("perf pmu: Use perf_pmu__open_file() and perf_pmu__scan_file()") f8ad6018ce3c ("perf pmu: Remove duplication around EVENT_SOURCE_DEVICE_PATH") acef233b7ca7 ("perf pmu: Add #slots literal support for arm64") 688d2e8de231 ("perf lock contention: Add -l/--lock-addr option") eca949b2b4ad ("perf lock contention: Implement -t/--threads option for BPF") fd507d3e359c ("perf lock contention: Add lock_data.h for common data") 378ef0f5d9d7 ("perf build: Use libtraceevent from the system") 616aa32d6f22 ("perf build: Fixes for LIBTRACEEVENT_DYNAMIC") cc2367eebb0c ("machine: Adopt is_lock_function() from builtin-lock.c") 336b92da1aa4 ("perf tool: Move pmus list variable to a new file") a3720e969c6d ("perf build: Fix LIBTRACEEVENT_DYNAMIC") 746bd29e348f ("perf build: Use tools/lib headers from install path") bd560973c5d3 ("perf expr: Tidy hashmap dependency")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c7e97f215a4ad634b746804679f5937d25f77e29 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <[email protected]>
Date: Thu, 27 Jul 2023 19:24:47 -0700
Subject: [PATCH] perf build: Include generated header files properly

The flex and bison generate header files from the source. When user specified a build directory with O= option, it'd generate files under the directory. The build command has -I option to specify the header include directory.

But the -I option only affects the files included like <...>. Let's change the flex and bison headers to use it instead of "...".

index 08ec9aa583e7..8cd561aa606a 100755
@@ -1000,7 +1000,7 @@ such as "arm/cortex-a34".''',
   _args = ap.parse_args()
 
   _args.output_file.write("""
-#include "pmu-events/pmu-events.h"
+#include <pmu-events/pmu-events.h>
 #include "util/header.h"
 #include "util/pmu.h"
 #include <string.h>

index 0b30688d78a7..47f01df658d9 100644
@@ -9,8 +9,8 @@
 #include "util/evsel.h"
 
 #include "util/bpf-filter.h"
-#include "util/bpf-filter-flex.h"
-#include "util/bpf-filter-bison.h"
+#include <util/bpf-filter-flex.h>
+#include <util/bpf-filter-bison.h>
 
 #include "bpf_skel/sample-filter.h"
 #include "bpf_skel/sample_filter.skel.h"

index 4814262e3805..7410a165f68b 100644
@@ -10,8 +10,8 @@
 #include "debug.h"
 #include "evlist.h"
 #include "expr.h"
-#include "expr-bison.h"
-#include "expr-flex.h"
+#include <util/expr-bison.h>
+#include <util/expr-flex.h>
 #include "util/hashmap.h"
 #include "smt.h"
 #include "tsc.h"

index ac315e1be2bc..acddb2542b1a 100644
@@ -18,8 +18,8 @@
 #include "debug.h"
 #include <api/fs/tracing_path.h>
 #include <perf/cpumap.h>
-#include "parse-events-bison.h"
-#include "parse-events-flex.h"
+#include <util/parse-events-bison.h>
+#include <util/parse-events-flex.h>
 #include "pmu.h"
 #include "pmus.h"
 #include "asm/bug.h"

index 7f984a7f16ca..b6654b9f55d2 100644
@@ -19,8 +19,8 @@
 #include "evsel.h"
 #include "pmu.h"
 #include "pmus.h"
-#include "pmu-bison.h"
-#include "pmu-flex.h"
+#include <util/pmu-bison.h>
+#include <util/pmu-flex.h>
 #include "parse-events.h"
 #include "print-events.h"
 #include "header.h"