From: Sasha Levin Date: Mon, 31 Oct 2022 15:33:37 +0000 (-0400) Subject: Drop kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch X-Git-Tag: v4.19.263~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ac01601cbe43b681edd6392f80f1c8965750945;p=thirdparty%2Fkernel%2Fstable-queue.git Drop kvm-arm64-selftests-fix-multiple-versions-of-gic-cre.patch Signed-off-by: Sasha Levin --- 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 index fd8b972831a..00000000000 --- 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 -Date: Sun, 9 Oct 2022 11:31:31 +0800 -Subject: KVM: arm64: selftests: Fix multiple versions of GIC creation - -From: Zenghui Yu - -[ 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 -Reviewed-by: Oliver Upton -Signed-off-by: Marc Zyngier -Link: https://lore.kernel.org/r/20221009033131.365-1-yuzenghui@huawei.com -Signed-off-by: Sasha Levin ---- - 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 e2d9d59adc6..7045b2085c9 100644 --- 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