From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 1 Apr 2026 11:42:31 +0000 (+0200)
Subject: 6.19-stable patches
X-Git-Tag: v6.6.131~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfadde0a5dabc2151b3b0e22f3a50f5752693d2d;p=thirdparty%2Fkernel%2Fstable-queue.git

6.19-stable patches

added patches:
	revert-perf-jevents-handle-deleted-jsons-in-out-of-source-builds.patch
---

diff --git a/queue-6.19/revert-perf-jevents-handle-deleted-jsons-in-out-of-source-builds.patch b/queue-6.19/revert-perf-jevents-handle-deleted-jsons-in-out-of-source-builds.patch
new file mode 100644
index 0000000000..0bdf6ea661
--- /dev/null
+++ b/queue-6.19/revert-perf-jevents-handle-deleted-jsons-in-out-of-source-builds.patch
@@ -0,0 +1,67 @@
+From 08825b348326b0befe0a7f0ab0ed6aecfce5b1aa Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 1 Apr 2026 13:40:57 +0200
+Subject: Revert "perf jevents: Handle deleted JSONS in out of source builds"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b56111d7a4642ea7ef776ae97ecb1dd2724a1503 which is
+commit 297c9d96e3085116c5cde18170dba716a1f2591e upstream.
+
+It causes build issues for arm64.
+
+Link: https://lore.kernel.org/r/200019ee-d40a-414f-9dfb-c3fcbdbed969@gmail.com
+Reported-by: Florian Fainelli <f.fainelli@gmail.com>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: James Clark <james.clark@linaro.org>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/pmu-events/Build |   14 +++-----------
+ 1 file changed, 3 insertions(+), 11 deletions(-)
+
+--- a/tools/perf/pmu-events/Build
++++ b/tools/perf/pmu-events/Build
+@@ -1,6 +1,5 @@
+ pmu-events-y	+= pmu-events.o
+ JSON		=  $(shell find pmu-events/arch -name '*.json' -o -name '*.csv')
+-JSON_DIRS	=  $(shell find pmu-events/arch -type d)
+ JDIR_TEST	=  pmu-events/arch/test
+ JSON_TEST	=  $(shell [ -d $(JDIR_TEST) ] &&			\
+ 			find $(JDIR_TEST) -name '*.json')
+@@ -32,23 +31,16 @@ $(PMU_EVENTS_C): $(EMPTY_PMU_EVENTS_C)
+ else
+ # Copy checked-in json to OUTPUT for generation if it's an out of source build
+ ifneq ($(OUTPUT),)
+-# Remove all output directories when any source directory timestamp changes
+-# so there are no stale deleted files
+-JSON_DIRS_ROOT = $(OUTPUT)pmu-events/arch/
+-$(JSON_DIRS_ROOT): $(JSON_DIRS)
+-	$(Q)$(call echo-cmd,gen)rm -rf $@
+-	$(Q)mkdir -p $@
+-
+-$(OUTPUT)pmu-events/arch/%: pmu-events/arch/% $(JSON_DIRS_ROOT)
++$(OUTPUT)pmu-events/arch/%: pmu-events/arch/%
+ 	$(call rule_mkdir)
+ 	$(Q)$(call echo-cmd,gen)cp $< $@
+ endif
+ 
+-$(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY) $(JSON_DIRS_ROOT)
++$(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY)
+ 	$(call rule_mkdir)
+ 	$(Q)$(call echo-cmd,gen)$(PYTHON) $(LEGACY_CACHE_PY) > $@
+ 
+-GEN_JSON = $(patsubst %,$(OUTPUT)%,$(JSON)) $(LEGACY_CACHE_JSON) $(JSON_DIRS)
++GEN_JSON = $(patsubst %,$(OUTPUT)%,$(JSON)) $(LEGACY_CACHE_JSON)
+ 
+ $(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY)
+ 	$(call rule_mkdir)
diff --git a/queue-6.19/series b/queue-6.19/series
index 907b278657..c014778252 100644
--- a/queue-6.19/series
+++ b/queue-6.19/series
@@ -340,3 +340,4 @@ ext4-introduce-export_symbol_for_ext4_test-helper.patch
 ext4-fix-mballoc-test.c-is-not-compiled-when-ext4_ku.patch
 bug-avoid-format-attribute-warning-for-clang-as-well.patch
 bluetooth-l2cap-fix-regressions-caused-by-reusing-ident.patch
+revert-perf-jevents-handle-deleted-jsons-in-out-of-source-builds.patch