drop s390 patch that broke the build

diff --git a/queue-5.10/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch b/queue-5.10/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
deleted file mode 100644 (file)
index 9a59da6..0000000
--- a/queue-5.10/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 511565af7a431f82d5a72ba39bb4c4b141f30464 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Aug 2025 14:05:57 +0200
-Subject: s390/cpum_cf: Deny all sampling events by counter PMU
-
-From: Thomas Richter <tmricht@linux.ibm.com>
-
-[ Upstream commit ce971233242b5391d99442271f3ca096fb49818d ]
-
-Deny all sampling event by the CPUMF counter facility device driver
-and return -ENOENT. This return value is used to try other PMUs.
-Up to now events for type PERF_TYPE_HARDWARE were not tested for
-sampling and returned later on -EOPNOTSUPP. This ends the search
-for alternative PMUs. Change that behavior and try other PMUs
-instead.
-
-Fixes: 613a41b0d16e ("s390/cpum_cf: Reject request for sampling in event initialization")
-Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
-Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/perf_cpum_cf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
-index dddb32e53db8b..c772bee528c07 100644
---- a/arch/s390/kernel/perf_cpum_cf.c
-+++ b/arch/s390/kernel/perf_cpum_cf.c
-@@ -218,8 +218,6 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type)
-               break;
- 
-       case PERF_TYPE_HARDWARE:
--              if (is_sampling_event(event))   /* No sampling support */
--                      return -ENOENT;
-               ev = attr->config;
-               /* Count user space (problem-state) only */
-               if (!attr->exclude_user && attr->exclude_kernel) {
-@@ -317,6 +315,8 @@ static int cpumf_pmu_event_init(struct perf_event *event)
-       unsigned int type = event->attr.type;
-       int err;
- 
-+      if (is_sampling_event(event))   /* No sampling support */
-+              return err;
-       if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)
-               err = __hw_perf_event_init(event, type);
-       else if (event->pmu->type == type)
--- 
-2.51.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index adfd1c128809455ec3a812a3daed991e2712f94e..3b4bcc41c90183d88960ca925ae9c2aac719b3eb 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -8,7 +8,6 @@ nfsv4-don-t-clear-capabilities-that-won-t-be-reset.patch
 nfsv4-clear-the-nfs_cap_xattr-flag-if-not-supported-.patch
 tracing-fix-tracing_marker-may-trigger-page-fault-du.patch
 nfsv4-flexfiles-fix-layout-merge-mirror-check.patch
-s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
 tcp_bpf-call-sk_msg_free-when-tcp_bpf_send_verdict-f.patch
 overflow-correct-check_shl_overflow-comment.patch
 compiler.h-drop-fallback-overflow-checkers.patch

diff --git a/queue-5.15/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch b/queue-5.15/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
deleted file mode 100644 (file)
index 93183f4..0000000
--- a/queue-5.15/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7205e58278d378ec81325f35aa8604eea113c8ad Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Aug 2025 14:05:57 +0200
-Subject: s390/cpum_cf: Deny all sampling events by counter PMU
-
-From: Thomas Richter <tmricht@linux.ibm.com>
-
-[ Upstream commit ce971233242b5391d99442271f3ca096fb49818d ]
-
-Deny all sampling event by the CPUMF counter facility device driver
-and return -ENOENT. This return value is used to try other PMUs.
-Up to now events for type PERF_TYPE_HARDWARE were not tested for
-sampling and returned later on -EOPNOTSUPP. This ends the search
-for alternative PMUs. Change that behavior and try other PMUs
-instead.
-
-Fixes: 613a41b0d16e ("s390/cpum_cf: Reject request for sampling in event initialization")
-Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
-Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/perf_cpum_cf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
-index d2a2a18b55808..98b8bdbf31e44 100644
---- a/arch/s390/kernel/perf_cpum_cf.c
-+++ b/arch/s390/kernel/perf_cpum_cf.c
-@@ -453,8 +453,6 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type)
-               break;
- 
-       case PERF_TYPE_HARDWARE:
--              if (is_sampling_event(event))   /* No sampling support */
--                      return -ENOENT;
-               ev = attr->config;
-               /* Count user space (problem-state) only */
-               if (!attr->exclude_user && attr->exclude_kernel) {
-@@ -541,6 +539,8 @@ static int cpumf_pmu_event_init(struct perf_event *event)
-       unsigned int type = event->attr.type;
-       int err;
- 
-+      if (is_sampling_event(event))   /* No sampling support */
-+              return err;
-       if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)
-               err = __hw_perf_event_init(event, type);
-       else if (event->pmu->type == type)
--- 
-2.51.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 243ae9da961ded13bb352b404c92dfef834faa40..c41ed87fe90be8c614378fab30f8bf06b05b923f 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -13,7 +13,6 @@ nfsv4-clear-the-nfs_cap_fs_locations-flag-if-it-is-n.patch
 nfsv4-clear-the-nfs_cap_xattr-flag-if-not-supported-.patch
 tracing-fix-tracing_marker-may-trigger-page-fault-du.patch
 nfsv4-flexfiles-fix-layout-merge-mirror-check.patch
-s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
 tcp_bpf-call-sk_msg_free-when-tcp_bpf_send_verdict-f.patch
 kvm-x86-move-open-coded-cpuid-leaf-0x80000021-eax-bit-propagation-code.patch
 kvm-svm-return-tsa_sq_no-and-tsa_l1_no-bits-in-__do_cpuid_func.patch

diff --git a/queue-5.4/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch b/queue-5.4/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
deleted file mode 100644 (file)
index 98f8d99..0000000
--- a/queue-5.4/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b098f8c46e165b32681d7df84e7400c86ad39dba Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Aug 2025 14:05:57 +0200
-Subject: s390/cpum_cf: Deny all sampling events by counter PMU
-
-From: Thomas Richter <tmricht@linux.ibm.com>
-
-[ Upstream commit ce971233242b5391d99442271f3ca096fb49818d ]
-
-Deny all sampling event by the CPUMF counter facility device driver
-and return -ENOENT. This return value is used to try other PMUs.
-Up to now events for type PERF_TYPE_HARDWARE were not tested for
-sampling and returned later on -EOPNOTSUPP. This ends the search
-for alternative PMUs. Change that behavior and try other PMUs
-instead.
-
-Fixes: 613a41b0d16e ("s390/cpum_cf: Reject request for sampling in event initialization")
-Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
-Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/perf_cpum_cf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
-index dddb32e53db8b..c772bee528c07 100644
---- a/arch/s390/kernel/perf_cpum_cf.c
-+++ b/arch/s390/kernel/perf_cpum_cf.c
-@@ -218,8 +218,6 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type)
-               break;
- 
-       case PERF_TYPE_HARDWARE:
--              if (is_sampling_event(event))   /* No sampling support */
--                      return -ENOENT;
-               ev = attr->config;
-               /* Count user space (problem-state) only */
-               if (!attr->exclude_user && attr->exclude_kernel) {
-@@ -317,6 +315,8 @@ static int cpumf_pmu_event_init(struct perf_event *event)
-       unsigned int type = event->attr.type;
-       int err;
- 
-+      if (is_sampling_event(event))   /* No sampling support */
-+              return err;
-       if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)
-               err = __hw_perf_event_init(event, type);
-       else if (event->pmu->type == type)
--- 
-2.51.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d0777847da273971c1e8b2a9b0b9737069c41ad8..bb770c32d5fc737c5a6c2bc5e0f28ee963baa17a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,7 +1,6 @@
 usb-hub-fix-flushing-of-delayed-work-used-for-post-resume-purposes.patch
 net-fix-null-ptr-deref-by-sock_lock_init_class_and_name-and-rmmod.patch
 nfsv4-don-t-clear-capabilities-that-won-t-be-reset.patch
-s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
 tcp_bpf-call-sk_msg_free-when-tcp_bpf_send_verdict-f.patch
 edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch
 ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch

diff --git a/queue-6.1/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch b/queue-6.1/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
deleted file mode 100644 (file)
index da95d2a..0000000
--- a/queue-6.1/s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 57a7149d7598869240f478efb3d14755d8a30b0b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Aug 2025 14:05:57 +0200
-Subject: s390/cpum_cf: Deny all sampling events by counter PMU
-
-From: Thomas Richter <tmricht@linux.ibm.com>
-
-[ Upstream commit ce971233242b5391d99442271f3ca096fb49818d ]
-
-Deny all sampling event by the CPUMF counter facility device driver
-and return -ENOENT. This return value is used to try other PMUs.
-Up to now events for type PERF_TYPE_HARDWARE were not tested for
-sampling and returned later on -EOPNOTSUPP. This ends the search
-for alternative PMUs. Change that behavior and try other PMUs
-instead.
-
-Fixes: 613a41b0d16e ("s390/cpum_cf: Reject request for sampling in event initialization")
-Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
-Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/perf_cpum_cf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
-index 28fa80fd69fa0..77d36a1981325 100644
---- a/arch/s390/kernel/perf_cpum_cf.c
-+++ b/arch/s390/kernel/perf_cpum_cf.c
-@@ -459,8 +459,6 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type)
-               break;
- 
-       case PERF_TYPE_HARDWARE:
--              if (is_sampling_event(event))   /* No sampling support */
--                      return -ENOENT;
-               ev = attr->config;
-               if (!attr->exclude_user && attr->exclude_kernel) {
-                       /*
-@@ -554,6 +552,8 @@ static int cpumf_pmu_event_init(struct perf_event *event)
-       unsigned int type = event->attr.type;
-       int err;
- 
-+      if (is_sampling_event(event))   /* No sampling support */
-+              return err;
-       if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)
-               err = __hw_perf_event_init(event, type);
-       else if (event->pmu->type == type)
--- 
-2.51.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 1074422c953ff6304fac51d43fa27c3511b1aa34..faeca7043e78d7d21cfcd32dab5871a7317a9e9f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -14,7 +14,6 @@ tracing-fix-tracing_marker-may-trigger-page-fault-du.patch
 ftrace-samples-fix-function-size-computation.patch
 nfsv4-flexfiles-fix-layout-merge-mirror-check.patch
 tracing-silence-warning-when-chunk-allocation-fails-.patch
-s390-cpum_cf-deny-all-sampling-events-by-counter-pmu.patch
 tcp_bpf-call-sk_msg_free-when-tcp_bpf_send_verdict-f.patch
 proc-fix-type-confusion-in-pde_set_flags.patch
 kvm-x86-move-open-coded-cpuid-leaf-0x80000021-eax-bit-propagation-code.patch