Drop kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.0/kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch b/queue-6.0/kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch
deleted file mode 100644 (file)
index fd8b972..0000000
--- a/queue-6.0/kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f931decd1d2ae4349f0a6e0e98ede3c5970f4f3a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 9 Oct 2022 11:31:31 +0800
-Subject: KVM: arm64: selftests: Fix multiple versions of GIC creation
-
-From: Zenghui Yu <yuzenghui@huawei.com>
-
-[ Upstream commit 8a6ffcbe26fd14d58075dcf3cbdf1b5b69b20402 ]
-
-Commit 98f94ce42ac6 ("KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to
-separate helper") wrongly converted a "real" GIC device creation to
-__kvm_test_create_device() and caused the test failure on my D05 (which
-supports v2 emulation). Fix it.
-
-Fixes: 98f94ce42ac6 ("KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper")
-Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
-Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Link: https://lore.kernel.org/r/20221009033131.365-1-yuzenghui@huawei.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
-index e05ecb31823f..9c131d977a1b 100644
---- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
-+++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
-@@ -662,8 +662,8 @@ int test_kvm_device(uint32_t gic_dev_type)
-                                            : KVM_DEV_TYPE_ARM_VGIC_V2;
- 
-       if (!__kvm_test_create_device(v.vm, other)) {
--              ret = __kvm_test_create_device(v.vm, other);
--              TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
-+              ret = __kvm_create_device(v.vm, other);
-+              TEST_ASSERT(ret < 0 && (errno == EINVAL || errno == EEXIST),
-                               "create GIC device while other version exists");
-       }
- 
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index e2d9d59adc683a4a80ef86ceb718e43ff65e4632..7045b2085c911fe0574b4565750833231ed3084a 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -126,7 +126,6 @@ drm-msm-a6xx-replace-kcalloc-with-kvzalloc.patch
 drm-msm-dp-add-atomic_check-to-bridge-ops.patch
 drm-msm-fix-return-type-of-mdp4_lvds_connector_mode_.patch
 drm-msm-dp-cleared-dp_downspread_ctrl-register-befor.patch
-kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch
 asoc-codec-tlv320adc3xxx-add-gpiolib-dependency.patch
 kvm-selftests-fix-number-of-pages-for-memory-slot-in.patch
 asoc-qcom-lpass-cpu-mark-hdmi-tx-registers-as-volati.patch