From 604fe9e0e35e0aeda79a51b9f2d39dbcc101630d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 13 Apr 2022 07:26:50 -0500 Subject: [PATCH] kernel-5.18.0-0.rc2.a19944809fe9942.22 * Wed Apr 13 2022 Fedora Kernel Team [5.18.0-0.rc2.a19944809fe9942.22] - redhat/configs: enable CONFIG_SAMPLE_VFIO_MDEV_MTTY (Patrick Talbert) - Build intel_sdsi with %%{tools_make} (Justin M. Forbes) - configs: remove redundant Fedora config for INTEL_IDXD_COMPAT (Jerry Snitselaar) - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 4 ++-- kernel-s390x-debug-rhel.config | 34 ++++++++++++++++++++++++++++++- kernel-s390x-rhel.config | 34 ++++++++++++++++++++++++++++++- kernel-s390x-zfcpdump-rhel.config | 32 +++++++++++++++++++++++++++++ kernel-x86_64-debug-rhel.config | 34 ++++++++++++++++++++++++++++++- kernel-x86_64-rhel.config | 34 ++++++++++++++++++++++++++++++- kernel.spec | 19 +++++++++-------- mod-internal.list | 1 + sources | 6 +++--- 9 files changed, 181 insertions(+), 17 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index b2953974c..e6953d9a0 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6888ca0f9edde34646db3796af8c43aa0ecee9ab - 6888ca0f9edde34646db3796af8c43aa0ecee9ab tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a0c122c4fb17f350396cb664d2fc184df9872279 + a0c122c4fb17f350396cb664d2fc184df9872279 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed "https://gitlab.com/cki-project/kernel-ark/-/commit"/9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae 9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 30934f719..db9b3c50f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4455,7 +4455,39 @@ CONFIG_S390_TAPE_3590=m CONFIG_S390_TAPE=m # CONFIG_S390_UNWIND_SELFTEST is not set CONFIG_S390_VMUR=m -# CONFIG_SAMPLES is not set +# CONFIG_SAMPLE_ANDROID_BINDERFS is not set +# CONFIG_SAMPLE_AUXDISPLAY is not set +# CONFIG_SAMPLE_CONFIGFS is not set +# CONFIG_SAMPLE_CONNECTOR is not set +# CONFIG_SAMPLE_FANOTIFY_ERROR is not set +# CONFIG_SAMPLE_FPROBE is not set +# CONFIG_SAMPLE_FTRACE_DIRECT is not set +# CONFIG_SAMPLE_FTRACE_DIRECT_MULTI is not set +# CONFIG_SAMPLE_HIDRAW is not set +# CONFIG_SAMPLE_HW_BREAKPOINT is not set +# CONFIG_SAMPLE_INTEL_MEI is not set +# CONFIG_SAMPLE_KDB is not set +# CONFIG_SAMPLE_KFIFO is not set +# CONFIG_SAMPLE_KOBJECT is not set +# CONFIG_SAMPLE_KPROBES is not set +# CONFIG_SAMPLE_LANDLOCK is not set +# CONFIG_SAMPLE_LIVEPATCH is not set +# CONFIG_SAMPLE_PIDFD is not set +# CONFIG_SAMPLE_SECCOMP is not set +CONFIG_SAMPLES=y +# CONFIG_SAMPLE_TIMER is not set +# CONFIG_SAMPLE_TRACE_ARRAY is not set +# CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS is not set +# CONFIG_SAMPLE_TRACE_EVENTS is not set +# CONFIG_SAMPLE_TRACE_PRINTK is not set +# CONFIG_SAMPLE_UHID is not set +# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set +CONFIG_SAMPLE_VFIO_MDEV_MTTY=m +# CONFIG_SAMPLE_VFS is not set +# CONFIG_SAMPLE_WATCHDOG is not set +# CONFIG_SAMPLE_WATCH_QUEUE is not set # CONFIG_SATA_ACARD_AHCI is not set CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ce03fc803..caa1251f0 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4436,7 +4436,39 @@ CONFIG_S390_TAPE_3590=m CONFIG_S390_TAPE=m # CONFIG_S390_UNWIND_SELFTEST is not set CONFIG_S390_VMUR=m -# CONFIG_SAMPLES is not set +# CONFIG_SAMPLE_ANDROID_BINDERFS is not set +# CONFIG_SAMPLE_AUXDISPLAY is not set +# CONFIG_SAMPLE_CONFIGFS is not set +# CONFIG_SAMPLE_CONNECTOR is not set +# CONFIG_SAMPLE_FANOTIFY_ERROR is not set +# CONFIG_SAMPLE_FPROBE is not set +# CONFIG_SAMPLE_FTRACE_DIRECT is not set +# CONFIG_SAMPLE_FTRACE_DIRECT_MULTI is not set +# CONFIG_SAMPLE_HIDRAW is not set +# CONFIG_SAMPLE_HW_BREAKPOINT is not set +# CONFIG_SAMPLE_INTEL_MEI is not set +# CONFIG_SAMPLE_KDB is not set +# CONFIG_SAMPLE_KFIFO is not set +# CONFIG_SAMPLE_KOBJECT is not set +# CONFIG_SAMPLE_KPROBES is not set +# CONFIG_SAMPLE_LANDLOCK is not set +# CONFIG_SAMPLE_LIVEPATCH is not set +# CONFIG_SAMPLE_PIDFD is not set +# CONFIG_SAMPLE_SECCOMP is not set +CONFIG_SAMPLES=y +# CONFIG_SAMPLE_TIMER is not set +# CONFIG_SAMPLE_TRACE_ARRAY is not set +# CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS is not set +# CONFIG_SAMPLE_TRACE_EVENTS is not set +# CONFIG_SAMPLE_TRACE_PRINTK is not set +# CONFIG_SAMPLE_UHID is not set +# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set +CONFIG_SAMPLE_VFIO_MDEV_MTTY=m +# CONFIG_SAMPLE_VFS is not set +# CONFIG_SAMPLE_WATCHDOG is not set +# CONFIG_SAMPLE_WATCH_QUEUE is not set # CONFIG_SATA_ACARD_AHCI is not set CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index b8aa9d922..48318f82e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4453,7 +4453,39 @@ CONFIG_S390_TAPE_3590=m # CONFIG_S390_UNWIND_SELFTEST is not set CONFIG_S390_VMUR=y CONFIG_S390=y +# CONFIG_SAMPLE_ANDROID_BINDERFS is not set +# CONFIG_SAMPLE_AUXDISPLAY is not set +# CONFIG_SAMPLE_CONFIGFS is not set +# CONFIG_SAMPLE_CONNECTOR is not set +# CONFIG_SAMPLE_FANOTIFY_ERROR is not set +# CONFIG_SAMPLE_FPROBE is not set +# CONFIG_SAMPLE_FTRACE_DIRECT is not set +# CONFIG_SAMPLE_FTRACE_DIRECT_MULTI is not set +# CONFIG_SAMPLE_HIDRAW is not set +# CONFIG_SAMPLE_HW_BREAKPOINT is not set +# CONFIG_SAMPLE_INTEL_MEI is not set +# CONFIG_SAMPLE_KDB is not set +# CONFIG_SAMPLE_KFIFO is not set +# CONFIG_SAMPLE_KOBJECT is not set +# CONFIG_SAMPLE_KPROBES is not set +# CONFIG_SAMPLE_LANDLOCK is not set +# CONFIG_SAMPLE_LIVEPATCH is not set +# CONFIG_SAMPLE_PIDFD is not set +# CONFIG_SAMPLE_SECCOMP is not set # CONFIG_SAMPLES is not set +# CONFIG_SAMPLE_TIMER is not set +# CONFIG_SAMPLE_TRACE_ARRAY is not set +# CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS is not set +# CONFIG_SAMPLE_TRACE_EVENTS is not set +# CONFIG_SAMPLE_TRACE_PRINTK is not set +# CONFIG_SAMPLE_UHID is not set +# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set +CONFIG_SAMPLE_VFIO_MDEV_MTTY=m +# CONFIG_SAMPLE_VFS is not set +# CONFIG_SAMPLE_WATCHDOG is not set +# CONFIG_SAMPLE_WATCH_QUEUE is not set # CONFIG_SATA_ACARD_AHCI is not set CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d0f3cc10b..b1532a262 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4673,7 +4673,39 @@ CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SAMPLES is not set +# CONFIG_SAMPLE_ANDROID_BINDERFS is not set +# CONFIG_SAMPLE_AUXDISPLAY is not set +# CONFIG_SAMPLE_CONFIGFS is not set +# CONFIG_SAMPLE_CONNECTOR is not set +# CONFIG_SAMPLE_FANOTIFY_ERROR is not set +# CONFIG_SAMPLE_FPROBE is not set +# CONFIG_SAMPLE_FTRACE_DIRECT is not set +# CONFIG_SAMPLE_FTRACE_DIRECT_MULTI is not set +# CONFIG_SAMPLE_HIDRAW is not set +# CONFIG_SAMPLE_HW_BREAKPOINT is not set +# CONFIG_SAMPLE_INTEL_MEI is not set +# CONFIG_SAMPLE_KDB is not set +# CONFIG_SAMPLE_KFIFO is not set +# CONFIG_SAMPLE_KOBJECT is not set +# CONFIG_SAMPLE_KPROBES is not set +# CONFIG_SAMPLE_LANDLOCK is not set +# CONFIG_SAMPLE_LIVEPATCH is not set +# CONFIG_SAMPLE_PIDFD is not set +# CONFIG_SAMPLE_SECCOMP is not set +CONFIG_SAMPLES=y +# CONFIG_SAMPLE_TIMER is not set +# CONFIG_SAMPLE_TRACE_ARRAY is not set +# CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS is not set +# CONFIG_SAMPLE_TRACE_EVENTS is not set +# CONFIG_SAMPLE_TRACE_PRINTK is not set +# CONFIG_SAMPLE_UHID is not set +# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set +CONFIG_SAMPLE_VFIO_MDEV_MTTY=m +# CONFIG_SAMPLE_VFS is not set +# CONFIG_SAMPLE_WATCHDOG is not set +# CONFIG_SAMPLE_WATCH_QUEUE is not set CONFIG_SAMSUNG_LAPTOP=m CONFIG_SAMSUNG_Q10=m # CONFIG_SATA_ACARD_AHCI is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 1081a33d9..475557d7f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4651,7 +4651,39 @@ CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SAMPLES is not set +# CONFIG_SAMPLE_ANDROID_BINDERFS is not set +# CONFIG_SAMPLE_AUXDISPLAY is not set +# CONFIG_SAMPLE_CONFIGFS is not set +# CONFIG_SAMPLE_CONNECTOR is not set +# CONFIG_SAMPLE_FANOTIFY_ERROR is not set +# CONFIG_SAMPLE_FPROBE is not set +# CONFIG_SAMPLE_FTRACE_DIRECT is not set +# CONFIG_SAMPLE_FTRACE_DIRECT_MULTI is not set +# CONFIG_SAMPLE_HIDRAW is not set +# CONFIG_SAMPLE_HW_BREAKPOINT is not set +# CONFIG_SAMPLE_INTEL_MEI is not set +# CONFIG_SAMPLE_KDB is not set +# CONFIG_SAMPLE_KFIFO is not set +# CONFIG_SAMPLE_KOBJECT is not set +# CONFIG_SAMPLE_KPROBES is not set +# CONFIG_SAMPLE_LANDLOCK is not set +# CONFIG_SAMPLE_LIVEPATCH is not set +# CONFIG_SAMPLE_PIDFD is not set +# CONFIG_SAMPLE_SECCOMP is not set +CONFIG_SAMPLES=y +# CONFIG_SAMPLE_TIMER is not set +# CONFIG_SAMPLE_TRACE_ARRAY is not set +# CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS is not set +# CONFIG_SAMPLE_TRACE_EVENTS is not set +# CONFIG_SAMPLE_TRACE_PRINTK is not set +# CONFIG_SAMPLE_UHID is not set +# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set +# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set +CONFIG_SAMPLE_VFIO_MDEV_MTTY=m +# CONFIG_SAMPLE_VFS is not set +# CONFIG_SAMPLE_WATCHDOG is not set +# CONFIG_SAMPLE_WATCH_QUEUE is not set CONFIG_SAMSUNG_LAPTOP=m CONFIG_SAMSUNG_Q10=m # CONFIG_SATA_ACARD_AHCI is not set diff --git a/kernel.spec b/kernel.spec index 515942496..54c5420d4 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc2.23 +%global distro_build 0.rc2.20220413gita19944809fe9942.23 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc2.23 +%define pkgrelease 0.rc2.20220413gita19944809fe9942.23 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.23%{?buildid}%{?dist} +%define specrelease 0.rc2.20220413gita19944809fe9942.23%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -698,7 +698,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc2.tar.xz +Source0: linux-5.18-rc2-50-ga19944809fe9942.tar.xz Source1: Makefile.rhelver @@ -1390,8 +1390,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc2 -c -mv linux-5.18-rc2 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc2-50-ga19944809fe9942 -c +mv linux-5.18-rc2-50-ga19944809fe9942 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3025,7 +3025,10 @@ fi # # %changelog -* Mon Apr 11 2022 Fedora Kernel Team [5.18.0-0.rc2.22] +* Wed Apr 13 2022 Fedora Kernel Team [5.18.0-0.rc2.a19944809fe9942.22] +- redhat/configs: enable CONFIG_SAMPLE_VFIO_MDEV_MTTY (Patrick Talbert) +- Build intel_sdsi with %%{tools_make} (Justin M. Forbes) +- configs: remove redundant Fedora config for INTEL_IDXD_COMPAT (Jerry Snitselaar) - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) * Mon Apr 11 2022 Fedora Kernel Team [5.18.0-0.rc2.21] diff --git a/mod-internal.list b/mod-internal.list index b2e639887..e91296a9e 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -54,3 +54,4 @@ stackinit_kunit overflow_kunit clk-gate_test clk_test +mtty diff --git a/sources b/sources index c3b5e114c..31ff08144 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc2.tar.xz) = e9772d0a7986f1f6dced5919b514ed5710471a398be6e9791830607ba34491ad56c01e8a3cb3bdca5fc0aed71eb4adc532c7adfb2c8776d00fb77a657c601470 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc2.23.tar.bz2) = 94288333b24554c1ecc07c20f30a97b37eae8b79c8f82182dea0552fcf6e30ffb37a422c80c7d749e5d9a1cf62afdd57953299780677ed231a018ee7ac3f3c82 -SHA512 (kernel-kabi-dw-5.18.0-0.rc2.23.tar.bz2) = d0e054480dad43f4a79a999712aa1f034f2e28fd2516721d947c7275344bb560c6edf3fe1cde143e93eca85d56af5fd162e515271f0937fa7f7abf1735a54c53 +SHA512 (linux-5.18-rc2-50-ga19944809fe9942.tar.xz) = 2c65363669f0879233fe4d8fbce714dd9866edc4857a637152e1b7325db6ca3bd79ba4985755177dce527ffb033f138ece037d15b37ac3fec3d823a402a49573 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc2.20220413gita19944809fe9942.23.tar.bz2) = 12f2ef70f8477d3500b9a540be8b7f0963bbc66ed1e7fee449953502b6bcde5c4720785fca334d03f965d65f80d115da81b00f8d192f0755f6129369ad62b1cb +SHA512 (kernel-kabi-dw-5.18.0-0.rc2.20220413gita19944809fe9942.23.tar.bz2) = ae3905ef30b73bdf474079da9fcd6a22bbf8704406b0c977cb51490c7153820ddb350aae4a9aca5267c85b5a364020775d08984384c5d56e58fa04de4d19a87c