drop queue-6.1/perf-python-disable-wno-cast-function-type-mismatch-if-present-on...

diff --git a/queue-6.1/perf-python-disable-wno-cast-function-type-mismatch-if-present-on-clang.patch b/queue-6.1/perf-python-disable-wno-cast-function-type-mismatch-if-present-on-clang.patch
deleted file mode 100644 (file)
index a8082a1..0000000
--- a/queue-6.1/perf-python-disable-wno-cast-function-type-mismatch-if-present-on-clang.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 00dc514612fe98cfa117193b9df28f15e7c9db9c Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Thu, 22 Aug 2024 14:13:49 -0300
-Subject: perf python: Disable -Wno-cast-function-type-mismatch if present on clang
-
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-
-commit 00dc514612fe98cfa117193b9df28f15e7c9db9c upstream.
-
-The -Wcast-function-type-mismatch option was introduced in clang 19 and
-its enabled by default, since we use -Werror, and python bindings do
-casts that are valid but trips this warning, disable it if present.
-
-Closes: https://lore.kernel.org/all/CA+icZUXoJ6BS3GMhJHV3aZWyb5Cz2haFneX0C5pUMUUhG-UVKQ@mail.gmail.com
-Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Nathan Chancellor <nathan@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: stable@vger.kernel.org # To allow building with the upcoming clang 19
-Link: https://lore.kernel.org/lkml/CA+icZUVtHn8X1Tb_Y__c-WswsO0K8U9uy3r2MzKXwTA5THtL7w@mail.gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- tools/perf/util/setup.py |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/tools/perf/util/setup.py
-+++ b/tools/perf/util/setup.py
-@@ -50,6 +50,8 @@ cflags = getenv('CFLAGS', '').split()
- cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ]
- if cc_is_clang:
-     cflags += ["-Wno-unused-command-line-argument" ]
-+    if clang_has_option("-Wno-cast-function-type-mismatch"):
-+        cflags += ["-Wno-cast-function-type-mismatch" ]
- else:
-     cflags += ['-Wno-cast-function-type' ]
- 

diff --git a/queue-6.1/series b/queue-6.1/series
index 4ee17603deef5af4551388482499095130ab6114..2659633fd64d0f16e674c6d9ebe39bd63e7879d7 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -575,7 +575,6 @@ ocfs2-fix-null-ptr-deref-when-journal-load-failed.patch
 ocfs2-fix-possible-null-ptr-deref-in-ocfs2_set_buffer_uptodate.patch
 riscv-define-illegal_pointer_value-for-64bit.patch
 exfat-fix-memory-leak-in-exfat_load_bitmap.patch
-perf-python-disable-wno-cast-function-type-mismatch-if-present-on-clang.patch
 perf-hist-update-hist-symbol-when-updating-maps.patch
 nfsd-fix-delegation_blocked-to-block-correctly-for-at-least-30-seconds.patch
 nfsd-map-the-ebadmsg-to-nfserr_io-to-avoid-warning.patch