delete 3.10 and 3.14 kvm s390 patch

diff --git a/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch b/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
deleted file mode 100644 (file)
index 7d07cce..0000000
--- a/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 Mon Sep 17 00:00:00 2001
-From: David Hildenbrand <dahi@linux.vnet.ibm.com>
-Date: Thu, 15 Jan 2015 17:56:18 +0100
-Subject: KVM: s390: floating irqs: fix user triggerable endless loop
-
-From: David Hildenbrand <dahi@linux.vnet.ibm.com>
-
-commit 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 upstream.
-
-If a vm with no VCPUs is created, the injection of a floating irq
-leads to an endless loop in the kernel.
-
-Let's skip the search for a destination VCPU for a floating irq if no
-VCPUs were created.
-
-Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
-Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
-Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/kvm/interrupt.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/s390/kvm/interrupt.c
-+++ b/arch/s390/kvm/interrupt.c
-@@ -736,6 +736,8 @@ int kvm_s390_inject_vm(struct kvm *kvm,
-               list_add_tail(&inti->list, &iter->list);
-       }
-       atomic_set(&fi->active, 1);
-+      if (atomic_read(&kvm->online_vcpus) == 0)
-+              goto unlock_fi;
-       sigcpu = find_first_bit(fi->idle_mask, KVM_MAX_VCPUS);
-       if (sigcpu == KVM_MAX_VCPUS) {
-               do {

diff --git a/queue-3.10/series b/queue-3.10/series
index 47b12b03bd1461d8e304291942157c1708b2f637..811d4f3ee114faef7166f3aa63d99e3380f0970a 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -39,7 +39,6 @@ arm-pxa-add-regulator_has_full_constraints-to-poodle-board-file.patch
 kdb-fix-incorrect-counts-in-kdb-summary-command-output.patch
 ntp-fixup-adjtimex-freq-validation-on-32-bit-systems.patch
 arc-fix-page-address-calculation-if-page_offset-linux_link_base.patch
-kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
 kvm-mips-don-t-leak-fpu-dsp-to-guest.patch
 kvm-x86-update-masterclock-values-on-tsc-writes.patch
 hx4700-regulator-declare-full-constraints.patch

diff --git a/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch b/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
deleted file mode 100644 (file)
index 1156a25..0000000
--- a/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 Mon Sep 17 00:00:00 2001
-From: David Hildenbrand <dahi@linux.vnet.ibm.com>
-Date: Thu, 15 Jan 2015 17:56:18 +0100
-Subject: KVM: s390: floating irqs: fix user triggerable endless loop
-
-From: David Hildenbrand <dahi@linux.vnet.ibm.com>
-
-commit 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 upstream.
-
-If a vm with no VCPUs is created, the injection of a floating irq
-leads to an endless loop in the kernel.
-
-Let's skip the search for a destination VCPU for a floating irq if no
-VCPUs were created.
-
-Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
-Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
-Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/kvm/interrupt.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/s390/kvm/interrupt.c
-+++ b/arch/s390/kvm/interrupt.c
-@@ -739,6 +739,8 @@ int kvm_s390_inject_vm(struct kvm *kvm,
-               list_add_tail(&inti->list, &iter->list);
-       }
-       atomic_set(&fi->active, 1);
-+      if (atomic_read(&kvm->online_vcpus) == 0)
-+              goto unlock_fi;
-       sigcpu = find_first_bit(fi->idle_mask, KVM_MAX_VCPUS);
-       if (sigcpu == KVM_MAX_VCPUS) {
-               do {

diff --git a/queue-3.14/series b/queue-3.14/series
index d763564f42647fa0e6a645dbf3768a7fdb89b3a2..8d8336c0c9c4bfd0e5606681ca0aa98980869034 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -54,7 +54,6 @@ arm-pxa-add-regulator_has_full_constraints-to-poodle-board-file.patch
 kdb-fix-incorrect-counts-in-kdb-summary-command-output.patch
 ntp-fixup-adjtimex-freq-validation-on-32-bit-systems.patch
 arc-fix-page-address-calculation-if-page_offset-linux_link_base.patch
-kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch
 kvm-mips-don-t-leak-fpu-dsp-to-guest.patch
 kvm-x86-update-masterclock-values-on-tsc-writes.patch
 hx4700-regulator-declare-full-constraints.patch