summaryrefslogtreecommitdiffstats
path: root/patch-6.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-6.0-redhat.patch')
-rw-r--r--patch-6.0-redhat.patch31
1 files changed, 2 insertions, 29 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index e5c992c87..bb3cc1374 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -48,7 +48,7 @@
47 files changed, 767 insertions(+), 365 deletions(-)
diff --git a/Makefile b/Makefile
-index 46c6eb57b354..ad3a206451ea 100644
+index bf00f3240b3a..f6fb779815ef 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1088,7 +1088,7 @@ index 3a808146b50f..c1a3f3057921 100644
* Changes the default domain of an iommu group that has *only* one device
*
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index f612a0ba64d0..5c4a1ca36aec 100644
+index aca50bb93750..2f54b3560433 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -2160,30 +2160,3 @@ index 4b95de24bc8d..10047790e96e 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001
-From: "Justin M. Forbes" <jforbes@fedoraproject.org>
-Date: Thu, 3 Nov 2022 11:34:03 -0500
-Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide"
-
-This option is not supported by older pahole versions.
-
-This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396.
----
- scripts/pahole-flags.sh | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
-index 81c8e082ec57..0d99ef17e4a5 100755
---- a/scripts/pahole-flags.sh
-+++ b/scripts/pahole-flags.sh
-@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then
- extra_paholeopt="${extra_paholeopt} -j"
- fi
-
--# temporary workaround to disable enum64
--extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
--
- echo ${extra_paholeopt}
---
-2.37.3
-