From: Greg Kroah-Hartman Date: Mon, 11 Feb 2019 16:52:57 +0000 (+0100) Subject: drop s390 kvm patch from all branches. X-Git-Tag: v4.9.156~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a8e43b122de1c97e4a45b9ee437a392d0743bab;p=thirdparty%2Fkernel%2Fstable-queue.git drop s390 kvm patch from all branches. --- diff --git a/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch deleted file mode 100644 index 223e119ee10..00000000000 --- a/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 798536c2da1d3d951a71807eb6f2978ff411f625 Mon Sep 17 00:00:00 2001 -From: Michael Mueller -Date: Fri, 30 Nov 2018 15:32:06 +0100 -Subject: KVM: s390: unregister debug feature on failing arch init - -[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] - -Make sure the debug feature and its allocated resources get -released upon unsuccessful architecture initialization. - -A related indication of the issue will be reported as kernel -message. - -Signed-off-by: Michael Mueller -Reviewed-by: Cornelia Huck -Reviewed-by: Pierre Morel -Reviewed-by: David Hildenbrand -Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> -Signed-off-by: Christian Borntraeger -Signed-off-by: Sasha Levin ---- - arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index 4f6adbea592b..f674a81c8868 100644 ---- a/arch/s390/kvm/kvm-s390.c -+++ b/arch/s390/kvm/kvm-s390.c -@@ -361,19 +361,30 @@ static void kvm_s390_cpu_feat_init(void) - - int kvm_arch_init(void *opaque) - { -+ int rc; -+ - kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); - if (!kvm_s390_dbf) - return -ENOMEM; - - if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { -- debug_unregister(kvm_s390_dbf); -- return -ENOMEM; -+ rc = -ENOMEM; -+ goto out_debug_unreg; - } - - kvm_s390_cpu_feat_init(); - - /* Register floating interrupt controller interface. */ -- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ if (rc) { -+ pr_err("Failed to register FLIC rc=%d\n", rc); -+ goto out_debug_unreg; -+ } -+ return 0; -+ -+out_debug_unreg: -+ debug_unregister(kvm_s390_dbf); -+ return rc; - } - - void kvm_arch_exit(void) --- -2.19.1 - diff --git a/queue-4.14/series b/queue-4.14/series index f6b2d6a87e5..92b2ef4fc9f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -101,7 +101,6 @@ tty-serial-samsung-properly-set-flags-in-autocts-mod.patch perf-test-fix-perf_event_attr-test-failure.patch perf-header-fix-unchecked-usage-of-strncpy.patch perf-probe-fix-unchecked-usage-of-strncpy.patch -kvm-s390-unregister-debug-feature-on-failing-arch-in.patch arm64-kvm-skip-mmio-insn-after-emulation.patch usb-musb-dsps-fix-otg-state-machine.patch percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch diff --git a/queue-4.19/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.19/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch deleted file mode 100644 index 3e373636c83..00000000000 --- a/queue-4.19/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8bf2972954a7bc8a2e6a48cdc1da086c361d8f1f Mon Sep 17 00:00:00 2001 -From: Michael Mueller -Date: Fri, 30 Nov 2018 15:32:06 +0100 -Subject: KVM: s390: unregister debug feature on failing arch init - -[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] - -Make sure the debug feature and its allocated resources get -released upon unsuccessful architecture initialization. - -A related indication of the issue will be reported as kernel -message. - -Signed-off-by: Michael Mueller -Reviewed-by: Cornelia Huck -Reviewed-by: Pierre Morel -Reviewed-by: David Hildenbrand -Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> -Signed-off-by: Christian Borntraeger -Signed-off-by: Sasha Levin ---- - arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index ac5da6b0b862..6aacb8d3dd9e 100644 ---- a/arch/s390/kvm/kvm-s390.c -+++ b/arch/s390/kvm/kvm-s390.c -@@ -416,19 +416,30 @@ static void kvm_s390_cpu_feat_init(void) - - int kvm_arch_init(void *opaque) - { -+ int rc; -+ - kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); - if (!kvm_s390_dbf) - return -ENOMEM; - - if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { -- debug_unregister(kvm_s390_dbf); -- return -ENOMEM; -+ rc = -ENOMEM; -+ goto out_debug_unreg; - } - - kvm_s390_cpu_feat_init(); - - /* Register floating interrupt controller interface. */ -- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ if (rc) { -+ pr_err("Failed to register FLIC rc=%d\n", rc); -+ goto out_debug_unreg; -+ } -+ return 0; -+ -+out_debug_unreg: -+ debug_unregister(kvm_s390_dbf); -+ return rc; - } - - void kvm_arch_exit(void) --- -2.19.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 1a0433999a0..74e7bcf20a8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -161,7 +161,6 @@ btrfs-use-tagged-writepage-to-mitigate-livelock-of-s.patch perf-probe-fix-unchecked-usage-of-strncpy.patch i2c-sh_mobile-add-support-for-r8a774c0-rz-g2e.patch bnxt_en-disable-msix-before-re-reserving-nqs-cmpl-ri.patch -kvm-s390-unregister-debug-feature-on-failing-arch-in.patch tools-power-x86-intel_pstate_tracer-fix-non-root-exe.patch livepatch-check-kzalloc-return-values.patch arm64-kvm-skip-mmio-insn-after-emulation.patch diff --git a/queue-4.20/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.20/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch deleted file mode 100644 index 7df497168d8..00000000000 --- a/queue-4.20/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 97cbeb24612a45f7756d78107bae0683c909bff2 Mon Sep 17 00:00:00 2001 -From: Michael Mueller -Date: Fri, 30 Nov 2018 15:32:06 +0100 -Subject: KVM: s390: unregister debug feature on failing arch init - -[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] - -Make sure the debug feature and its allocated resources get -released upon unsuccessful architecture initialization. - -A related indication of the issue will be reported as kernel -message. - -Signed-off-by: Michael Mueller -Reviewed-by: Cornelia Huck -Reviewed-by: Pierre Morel -Reviewed-by: David Hildenbrand -Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> -Signed-off-by: Christian Borntraeger -Signed-off-by: Sasha Levin ---- - arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index fe24150ff666..d8d8e0788157 100644 ---- a/arch/s390/kvm/kvm-s390.c -+++ b/arch/s390/kvm/kvm-s390.c -@@ -417,19 +417,30 @@ static void kvm_s390_cpu_feat_init(void) - - int kvm_arch_init(void *opaque) - { -+ int rc; -+ - kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); - if (!kvm_s390_dbf) - return -ENOMEM; - - if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { -- debug_unregister(kvm_s390_dbf); -- return -ENOMEM; -+ rc = -ENOMEM; -+ goto out_debug_unreg; - } - - kvm_s390_cpu_feat_init(); - - /* Register floating interrupt controller interface. */ -- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ if (rc) { -+ pr_err("Failed to register FLIC rc=%d\n", rc); -+ goto out_debug_unreg; -+ } -+ return 0; -+ -+out_debug_unreg: -+ debug_unregister(kvm_s390_dbf); -+ return rc; - } - - void kvm_arch_exit(void) --- -2.19.1 - diff --git a/queue-4.20/series b/queue-4.20/series index 5cb3824aac8..2199f56a2d7 100644 --- a/queue-4.20/series +++ b/queue-4.20/series @@ -190,7 +190,6 @@ btrfs-use-tagged-writepage-to-mitigate-livelock-of-s.patch perf-probe-fix-unchecked-usage-of-strncpy.patch i2c-sh_mobile-add-support-for-r8a774c0-rz-g2e.patch bnxt_en-disable-msix-before-re-reserving-nqs-cmpl-ri.patch -kvm-s390-unregister-debug-feature-on-failing-arch-in.patch tools-power-x86-intel_pstate_tracer-fix-non-root-exe.patch pinctrl-rza1-handle-devm_kasprintf-failure-cases.patch mac80211-properly-handle-skb-with-radiotap-only.patch diff --git a/queue-4.4/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.4/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch deleted file mode 100644 index e2ac9440aec..00000000000 --- a/queue-4.4/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5b683e56f06d88dec8afdd239fd16eabfb5fd0e8 Mon Sep 17 00:00:00 2001 -From: Michael Mueller -Date: Fri, 30 Nov 2018 15:32:06 +0100 -Subject: KVM: s390: unregister debug feature on failing arch init - -[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] - -Make sure the debug feature and its allocated resources get -released upon unsuccessful architecture initialization. - -A related indication of the issue will be reported as kernel -message. - -Signed-off-by: Michael Mueller -Reviewed-by: Cornelia Huck -Reviewed-by: Pierre Morel -Reviewed-by: David Hildenbrand -Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> -Signed-off-by: Christian Borntraeger -Signed-off-by: Sasha Levin ---- - arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index 5ddb1debba95..2b967f81c58e 100644 ---- a/arch/s390/kvm/kvm-s390.c -+++ b/arch/s390/kvm/kvm-s390.c -@@ -185,17 +185,28 @@ void kvm_arch_hardware_unsetup(void) - - int kvm_arch_init(void *opaque) - { -+ int rc; -+ - kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); - if (!kvm_s390_dbf) - return -ENOMEM; - - if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { -- debug_unregister(kvm_s390_dbf); -- return -ENOMEM; -+ rc = -ENOMEM; -+ goto out_debug_unreg; - } - - /* Register floating interrupt controller interface. */ -- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ if (rc) { -+ pr_err("Failed to register FLIC rc=%d\n", rc); -+ goto out_debug_unreg; -+ } -+ return 0; -+ -+out_debug_unreg: -+ debug_unregister(kvm_s390_dbf); -+ return rc; - } - - void kvm_arch_exit(void) --- -2.19.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 3b75c7a3033..ec524a32601 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -41,7 +41,6 @@ asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch arm-mmp-fix-timer_init-calls.patch memstick-prevent-memstick-host-from-getting-runtime-.patch tty-serial-samsung-properly-set-flags-in-autocts-mod.patch -kvm-s390-unregister-debug-feature-on-failing-arch-in.patch arm64-kvm-skip-mmio-insn-after-emulation.patch powerpc-uaccess-fix-warning-error-with-access_ok.patch mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch diff --git a/queue-4.9/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.9/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch deleted file mode 100644 index b5ab8349885..00000000000 --- a/queue-4.9/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a92919085eff9bd84723d1b2684398275ee5f645 Mon Sep 17 00:00:00 2001 -From: Michael Mueller -Date: Fri, 30 Nov 2018 15:32:06 +0100 -Subject: KVM: s390: unregister debug feature on failing arch init - -[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] - -Make sure the debug feature and its allocated resources get -released upon unsuccessful architecture initialization. - -A related indication of the issue will be reported as kernel -message. - -Signed-off-by: Michael Mueller -Reviewed-by: Cornelia Huck -Reviewed-by: Pierre Morel -Reviewed-by: David Hildenbrand -Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> -Signed-off-by: Christian Borntraeger -Signed-off-by: Sasha Levin ---- - arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index 2032ab81b2d7..c82b73f111b5 100644 ---- a/arch/s390/kvm/kvm-s390.c -+++ b/arch/s390/kvm/kvm-s390.c -@@ -319,19 +319,30 @@ static void kvm_s390_cpu_feat_init(void) - - int kvm_arch_init(void *opaque) - { -+ int rc; -+ - kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); - if (!kvm_s390_dbf) - return -ENOMEM; - - if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { -- debug_unregister(kvm_s390_dbf); -- return -ENOMEM; -+ rc = -ENOMEM; -+ goto out_debug_unreg; - } - - kvm_s390_cpu_feat_init(); - - /* Register floating interrupt controller interface. */ -- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); -+ if (rc) { -+ pr_err("Failed to register FLIC rc=%d\n", rc); -+ goto out_debug_unreg; -+ } -+ return 0; -+ -+out_debug_unreg: -+ debug_unregister(kvm_s390_dbf); -+ return rc; - } - - void kvm_arch_exit(void) --- -2.19.1 - diff --git a/queue-4.9/series b/queue-4.9/series index fab37f38f1b..9fd0ec36c50 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -56,7 +56,6 @@ memstick-prevent-memstick-host-from-getting-runtime-.patch tty-serial-samsung-properly-set-flags-in-autocts-mod.patch perf-header-fix-unchecked-usage-of-strncpy.patch perf-probe-fix-unchecked-usage-of-strncpy.patch -kvm-s390-unregister-debug-feature-on-failing-arch-in.patch arm64-kvm-skip-mmio-insn-after-emulation.patch powerpc-uaccess-fix-warning-error-with-access_ok.patch mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch