From 855b56819d59218f8d9c69b165b8b0294b902a89 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 17 Jul 2022 21:34:47 -0400 Subject: [PATCH] Drop wireguard-selftests-use-virt-machine-on-m68k.patch Signed-off-by: Sasha Levin --- queue-5.18/series | 1 - ...d-selftests-use-virt-machine-on-m68k.patch | 58 ------------------- 2 files changed, 59 deletions(-) delete mode 100644 queue-5.18/wireguard-selftests-use-virt-machine-on-m68k.patch diff --git a/queue-5.18/series b/queue-5.18/series index 23c28045f67..a592f1039b0 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -213,6 +213,5 @@ alsa-usb-audio-add-quirk-for-fiero-sc-01-fw-v1.0.0.patch nvme-pci-phison-e16-has-bogus-namespace-ids.patch nvme-use-struct-group-for-generic-command-dwords.patch wireguard-selftests-set-fake-real-time-in-init.patch -wireguard-selftests-use-virt-machine-on-m68k.patch wireguard-selftests-always-call-kernel-makefile.patch signal-handling-don-t-use-bug_on-for-debugging.patch diff --git a/queue-5.18/wireguard-selftests-use-virt-machine-on-m68k.patch b/queue-5.18/wireguard-selftests-use-virt-machine-on-m68k.patch deleted file mode 100644 index f12aa2da50f..00000000000 --- a/queue-5.18/wireguard-selftests-use-virt-machine-on-m68k.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e91eead809767c82b8b3f54dd31f8d77490eb098 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Jul 2022 02:31:53 +0200 -Subject: wireguard: selftests: use virt machine on m68k - -From: Jason A. Donenfeld - -[ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ] - -This should be a bit more stable hopefully. - -Signed-off-by: Jason A. Donenfeld -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/wireguard/qemu/Makefile | 5 +++-- - tools/testing/selftests/wireguard/qemu/arch/m68k.config | 9 +++------ - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile -index bca07b93eeb0..e8a82e495d2e 100644 ---- a/tools/testing/selftests/wireguard/qemu/Makefile -+++ b/tools/testing/selftests/wireguard/qemu/Makefile -@@ -210,10 +210,11 @@ QEMU_ARCH := m68k - KERNEL_ARCH := m68k - KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux - KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/m68k.config) -+QEMU_VPORT_RESULT := virtio-serial-device - ifeq ($(HOST_ARCH),$(ARCH)) --QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -append $(KERNEL_CMDLINE) -+QEMU_MACHINE := -cpu host,accel=kvm -machine virt -append $(KERNEL_CMDLINE) - else --QEMU_MACHINE := -machine q800 -smp 1 -append $(KERNEL_CMDLINE) -+QEMU_MACHINE := -machine virt -smp 1 -append $(KERNEL_CMDLINE) - endif - else ifeq ($(ARCH),riscv64) - CHOST := riscv64-linux-musl -diff --git a/tools/testing/selftests/wireguard/qemu/arch/m68k.config b/tools/testing/selftests/wireguard/qemu/arch/m68k.config -index 9639bfe06074..39c48cba56b7 100644 ---- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config -+++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config -@@ -1,10 +1,7 @@ - CONFIG_MMU=y -+CONFIG_VIRT=y - CONFIG_M68KCLASSIC=y --CONFIG_M68040=y --CONFIG_MAC=y --CONFIG_SERIAL_PMACZILOG=y --CONFIG_SERIAL_PMACZILOG_TTYS=y --CONFIG_SERIAL_PMACZILOG_CONSOLE=y -+CONFIG_VIRTIO_CONSOLE=y - CONFIG_COMPAT_32BIT_TIME=y --CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" -+CONFIG_CMDLINE="console=ttyGF0 wg.success=vport0p1 panic_on_warn=1" - CONFIG_FRAME_WARN=1024 --- -2.35.1 - -- 2.47.3