drop powerpc patch from 4.19 queue

it didn't belong there.

diff --git a/queue-4.19/powerpc-kexec-fix-loading-of-kernel-initramfs-with-kexec_file_load.patch b/queue-4.19/powerpc-kexec-fix-loading-of-kernel-initramfs-with-kexec_file_load.patch
deleted file mode 100644 (file)
index 7e0ffad..0000000
--- a/queue-4.19/powerpc-kexec-fix-loading-of-kernel-initramfs-with-kexec_file_load.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8b909e3548706cbebc0a676067b81aadda57f47e Mon Sep 17 00:00:00 2001
-From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
-Date: Wed, 22 May 2019 19:01:58 -0300
-Subject: powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()
-
-From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
-
-commit 8b909e3548706cbebc0a676067b81aadda57f47e upstream.
-
-Commit b6664ba42f14 ("s390, kexec_file: drop arch_kexec_mem_walk()")
-changed kexec_add_buffer() to skip searching for a memory location if
-kexec_buf.mem is already set, and use the address that is there.
-
-In powerpc code we reuse a kexec_buf variable for loading both the
-kernel and the initramfs by resetting some of the fields between those
-uses, but not mem. This causes kexec_add_buffer() to try to load the
-kernel at the same address where initramfs will be loaded, which is
-naturally rejected:
-
-  # kexec -s -l --initrd initramfs vmlinuz
-  kexec_file_load failed: Invalid argument
-
-Setting the mem field before every call to kexec_add_buffer() fixes
-this regression.
-
-Fixes: b6664ba42f14 ("s390, kexec_file: drop arch_kexec_mem_walk()")
-Cc: stable@vger.kernel.org # v5.0+
-Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
-Reviewed-by: Dave Young <dyoung@redhat.com>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/powerpc/kernel/kexec_elf_64.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kexec_elf_64.c
-+++ b/arch/powerpc/kernel/kexec_elf_64.c
-@@ -547,6 +547,7 @@ static int elf_exec_load(struct kimage *
-               kbuf.memsz = phdr->p_memsz;
-               kbuf.buf_align = phdr->p_align;
-               kbuf.buf_min = phdr->p_paddr + base;
-+              kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
-               ret = kexec_add_buffer(&kbuf);
-               if (ret)
-                       goto out;
-@@ -581,7 +582,8 @@ static void *elf64_load(struct kimage *i
-       struct kexec_buf kbuf = { .image = image, .buf_min = 0,
-                                 .buf_max = ppc64_rma_size };
-       struct kexec_buf pbuf = { .image = image, .buf_min = 0,
--                                .buf_max = ppc64_rma_size, .top_down = true };
-+                                .buf_max = ppc64_rma_size, .top_down = true,
-+                                .mem = KEXEC_BUF_MEM_UNKNOWN };
- 
-       ret = build_elf_exec_info(kernel_buf, kernel_len, &ehdr, &elf_info);
-       if (ret)
-@@ -606,6 +608,7 @@ static void *elf64_load(struct kimage *i
-               kbuf.bufsz = kbuf.memsz = initrd_len;
-               kbuf.buf_align = PAGE_SIZE;
-               kbuf.top_down = false;
-+              kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
-               ret = kexec_add_buffer(&kbuf);
-               if (ret)
-                       goto out;
-@@ -638,6 +641,7 @@ static void *elf64_load(struct kimage *i
-       kbuf.bufsz = kbuf.memsz = fdt_size;
-       kbuf.buf_align = PAGE_SIZE;
-       kbuf.top_down = true;
-+      kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
-       ret = kexec_add_buffer(&kbuf);
-       if (ret)
-               goto out;

diff --git a/queue-4.19/series b/queue-4.19/series
index 1ef33ded2a5f722e3eff81ee70b47410730d66d3..1950b85843475329f6246f9fdce20a990c609c78 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -28,7 +28,7 @@ s390-crypto-fix-gcm-aes-s390-selftest-failures.patch
 s390-crypto-fix-possible-sleep-during-spinlock-aquired.patch
 kvm-ppc-book3s-hv-xive-do-not-clear-irq-data-of-passthrough-interrupts.patch
 powerpc-perf-fix-mmcra-corruption-by-bhrb_filter.patch
-powerpc-kexec-fix-loading-of-kernel-initramfs-with-kexec_file_load.patch
 alsa-line6-assure-canceling-delayed-work-at-disconnection.patch
 alsa-hda-realtek-set-default-power-save-node-to-0.patch
 alsa-hda-realtek-improve-the-headset-mic-for-acer-aspire-laptops.patch
+kvm-s390-do-not-report-unusabled-ids-via-kvm_cap_max_vcpu_id.patch