From 888b015ab65ab8b81d8cd09ce51726544eeed4ba Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Apr 27 2020 04:27:57 +0000 Subject: Update to 5.7-rc3 - eliminated 1 patch - refresh configs --- diff --git a/config/i386/pae b/config/i386/pae index ff0af7e..c6c2bcf 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.7.0-rc2 Kernel Configuration +# Linux/i386 5.7.0-rc3 Kernel Configuration # # @@ -221,7 +221,6 @@ CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y -CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y @@ -2086,7 +2085,6 @@ CONFIG_PCI_FTPCI100=y CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCIE_XILINX=y -# CONFIG_PCI_HYPERV_INTERFACE is not set # # DesignWare PCI Core Support @@ -7799,11 +7797,11 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_MMIO is not set CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/config/ppc64/default b/config/ppc64/default index 90d00de..a1b3e23 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.7.0-rc1 Kernel Configuration +# Linux/powerpc 5.7.0-rc3 Kernel Configuration # # @@ -1819,7 +1819,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=y CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCIE_XILINX=y -# CONFIG_PCI_HYPERV_INTERFACE is not set # # DesignWare PCI Core Support @@ -6618,11 +6617,11 @@ CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/config/ppc64le/default b/config/ppc64le/default index 22f3e74..483898b 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.7.0-rc1 Kernel Configuration +# Linux/powerpc 5.7.0-rc3 Kernel Configuration # # @@ -1720,7 +1720,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=y CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCIE_XILINX=y -# CONFIG_PCI_HYPERV_INTERFACE is not set # # DesignWare PCI Core Support @@ -6470,11 +6469,11 @@ CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/config/riscv64/default b/config/riscv64/default index d7b71cf..75774d9 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 5.7.0-rc2 Kernel Configuration +# Linux/riscv 5.7.0-rc3 Kernel Configuration # # -# Compiler: riscv64-suse-linux-gcc (SUSE Linux) 9.2.1 20200109 [gcc-9-branch revision 280039] +# Compiler: riscv64-suse-linux-gcc (SUSE Linux) 9.3.1 20200406 [revision 6db837a5288ee3ca5ec504fbd5a765817e556ac2] # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90201 +CONFIG_GCC_VERSION=90301 CONFIG_LD_VERSION=234000000 # CONFIG_CC_IS_CLANG is not set CONFIG_CLANG_VERSION=0 @@ -1550,7 +1550,6 @@ CONFIG_HOTPLUG_PCI_SHPC=y # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCIE_XILINX=y -# CONFIG_PCI_HYPERV_INTERFACE is not set # # DesignWare PCI Core Support @@ -6712,11 +6711,11 @@ CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/config/s390x/default b/config/s390x/default index 714cb07..0822473 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.7.0-rc1 Kernel Configuration +# Linux/s390 5.7.0-rc3 Kernel Configuration # # @@ -1493,7 +1493,6 @@ CONFIG_HOTPLUG_PCI_S390=y # # PCI controller drivers # -# CONFIG_PCI_HYPERV_INTERFACE is not set # # DesignWare PCI Core Support @@ -2993,11 +2992,11 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_MMIO is not set CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump index 8e85ebf..9d50972 100644 --- a/config/s390x/zfcpdump +++ b/config/s390x/zfcpdump @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.7.0-rc1 Kernel Configuration +# Linux/s390 5.7.0-rc3 Kernel Configuration # # @@ -990,10 +990,10 @@ CONFIG_VIRTIO_VDPA=y # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_INPUT is not set CONFIG_VDPA=y -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=y CONFIG_VHOST_IOTLB=y CONFIG_VHOST_RING=y +CONFIG_VHOST_DPN=y CONFIG_VHOST=y CONFIG_VHOST_MENU=y # CONFIG_VHOST_NET is not set diff --git a/config/x86_64/default b/config/x86_64/default index 554e748..d355327 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.7.0-rc2 Kernel Configuration +# Linux/x86_64 5.7.0-rc3 Kernel Configuration # # @@ -7620,11 +7620,11 @@ CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VDPA=m -CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m +CONFIG_VHOST_DPN=y CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m diff --git a/patches.suse/tty-sysrq-Export-sysrq_mask.patch b/patches.suse/tty-sysrq-Export-sysrq_mask.patch deleted file mode 100644 index b18f58c..0000000 --- a/patches.suse/tty-sysrq-Export-sysrq_mask.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Dmitry Safonov -Date: Wed, 1 Apr 2020 15:39:04 +0100 -Subject: tty/sysrq: Export sysrq_mask() -Patch-mainline: Submitted - 2020-04-01 - http://lkml.kernel.org/r/20200401143904.423450-1-dima@arista.com -References: none - -Build fix for serial_core being module: - ERROR: modpost: "sysrq_mask" [drivers/tty/serial/serial_core.ko] undefined! - -Fixes: eaee41727e6d ("sysctl/sysrq: Remove __sysrq_enabled copy") -Cc: Greg Kroah-Hartman -Cc: Jiri Slaby -Reported-by: "kernelci.org bot" -Reported-by: Michael Ellerman -Signed-off-by: Dmitry Safonov -Acked-by: Michal Kubecek ---- - drivers/tty/sysrq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/tty/sysrq.c -+++ b/drivers/tty/sysrq.c -@@ -74,6 +74,7 @@ int sysrq_mask(void) - return 1; - return sysrq_enabled; - } -+EXPORT_SYMBOL_GPL(sysrq_mask); - - /* - * A value of 1 means 'all', other nonzero values are an op mask: diff --git a/rpm/config.sh b/rpm/config.sh index 3d68bcd..e68a908 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=5.7-rc2 +SRCVERSION=5.7-rc3 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression diff --git a/series.conf b/series.conf index fac0585..940cc36 100644 --- a/series.conf +++ b/series.conf @@ -50,7 +50,6 @@ # to get into mainline any time soon (or ever) belong # to area specific sections below. ######################################################## - patches.suse/tty-sysrq-Export-sysrq_mask.patch ######################################################## # kbuild/module infrastructure fixes