From 9c5b661cc26e69fc98cbd8e52222b9b9fc4e2a08 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 2 May 2022 08:44:51 -0500 Subject: kernel-5.18.0-0.rc5.40 * Mon May 02 2022 Fedora Kernel Team [5.18.0-0.rc5.39] - redhat/configs: Set GUP_TEST in debug kernel (Joel Savitz) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 24 +++++++++++++++++++++++- kernel-aarch64-debug-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel.spec | 29 +++++++++++++++++++---------- patch-5.18-redhat.patch | 14 +++++++------- sources | 6 +++--- 8 files changed, 56 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7da488b72..679b748aa 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,29 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 37 +RHEL_RELEASE = 40 + +# +# ZSTREAM +# ------- +# +# This variable controls whether we use zstream numbering or not for the +# package release. The zstream release keeps the build number of the last +# build done for ystream for the Beta milestone, and increments a second +# number for each build. The third number is used for branched builds +# (eg.: for builds with security fixes or hot fixes done outside of the +# batch release process). +# +# For example, with ZSTREAM unset or set to "no", all builds will contain +# a release with only the build number, eg.: kernel--X.el*, +# where X is the build number. With ZSTREAM set to "yes", we will have +# builds with kernel--X.Y.Z.el*, where X is the last +# RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the +# build number and Z will always be 1 except if you're doing a branched build +# (when you give RHDISTGIT_BRANCH on the command line, in which case the Z +# number will be incremented instead of the Y). +# +ZSTREAM ?= no # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index be3b268b8..40e53af41 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1885,7 +1885,7 @@ CONFIG_GPIO_XLP=m # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_GTP is not set -# CONFIG_GUP_TEST is not set +CONFIG_GUP_TEST=y CONFIG_GVE=m # CONFIG_HABANA_AI is not set # CONFIG_HAMACHI is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index e2c9df7e2..e0df765b2 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1719,7 +1719,7 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_GTP is not set -# CONFIG_GUP_TEST is not set +CONFIG_GUP_TEST=y CONFIG_GVE=m # CONFIG_HABANA_AI is not set # CONFIG_HAMACHI is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 45ab2e139..4d0adad1d 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1720,7 +1720,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_GTP is not set -# CONFIG_GUP_TEST is not set +CONFIG_GUP_TEST=y CONFIG_GVE=m # CONFIG_HABANA_AI is not set # CONFIG_HAMACHI is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7a7f8ce87..e899939a7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1825,7 +1825,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_GTP is not set -# CONFIG_GUP_TEST is not set +CONFIG_GUP_TEST=y CONFIG_GVE=m # CONFIG_HABANA_AI is not set CONFIG_HALTPOLL_CPUIDLE=y diff --git a/kernel.spec b/kernel.spec index bf8d19c1c..9a0f6e410 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,7 @@ 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 0 - -%global distro_build 0.rc4.20220429git38d741cb70b3074.37 +%define debugbuildsenabled 1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -131,13 +129,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc4.20220429git38d741cb70b3074.37 +%define pkgrelease 0.rc5.40 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220429git38d741cb70b3074.37%{?buildid}%{?dist} +%define specrelease 0.rc5.40%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +690,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc4-192-g38d741cb70b3074.tar.xz +Source0: linux-5.18-rc5.tar.xz Source1: Makefile.rhelver @@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{rpmversion}-%{pkgrelease}.tar.bz2 +Source301: kernel-kabi-dw-%{rpmversion}-%{pkgrelease}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -1384,8 +1382,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc4-192-g38d741cb70b3074 -c -mv linux-5.18-rc4-192-g38d741cb70b3074 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc5 -c +mv linux-5.18-rc5 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3027,6 +3025,17 @@ fi # # %changelog +* Mon May 02 2022 Fedora Kernel Team [5.18.0-0.rc5.39] +- redhat/configs: Set GUP_TEST in debug kernel (Joel Savitz) + +* Sat Apr 30 2022 Fedora Kernel Team [5.18.0-0.rc4.8013d1d3d2e3323.37] +- enable DAMON configs (Chris von Recklinghausen) [2004233] +- redhat: add zstream switch for zstream release numbering (Herton R. Krzesinski) +- redhat: change kabi tarballs to use the package release (Herton R. Krzesinski) +- redhat: generate distgit changelog in genspec.sh as well (Herton R. Krzesinski) +- redhat: make genspec prefer metadata from git notes (Herton R. Krzesinski) +- redhat: use tags from git notes for zstream to generate changelog (Herton R. Krzesinski) + * Wed Apr 27 2022 Fedora Kernel Team [5.18.0-0.rc4.46cf2c613f4b10e.34] - ARK: Remove code marking drivers as tech preview (Peter Georg) - ARK: Remove code marking devices deprecated (Peter Georg) diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 964f384e6..5c38c844d 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -124,7 +124,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index c3ec1ea42379..2262b65c424b 100644 +index 9a820c525b86..fbcfb1dc4578 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -649,7 +649,7 @@ index c59265146e9c..caa8458edde2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 3a293f919af9..b3d1b1ad8e97 100644 +index 4c9adb4f3d5d..4f660c064c70 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -52,6 +52,7 @@ @@ -682,7 +682,7 @@ index 3a293f919af9..b3d1b1ad8e97 100644 /* * Returns whether or not the input pool has been seeded and thus guaranteed * to supply cryptographically secure random numbers. This applies to: the -@@ -578,6 +587,63 @@ static ssize_t get_random_bytes_user(void __user *buf, size_t nbytes) +@@ -585,6 +594,63 @@ static ssize_t get_random_bytes_user(void __user *buf, size_t nbytes) return ret ? ret : -EFAULT; } @@ -746,7 +746,7 @@ index 3a293f919af9..b3d1b1ad8e97 100644 /* * Batched entropy returns random integers. The quality of the random * number is good as /dev/urandom. In order to ensure that the randomness -@@ -1177,6 +1243,19 @@ void add_bootloader_randomness(const void *buf, size_t size) +@@ -1184,6 +1250,19 @@ void add_bootloader_randomness(const void *buf, size_t size) } EXPORT_SYMBOL_GPL(add_bootloader_randomness); @@ -766,7 +766,7 @@ index 3a293f919af9..b3d1b1ad8e97 100644 #if IS_ENABLED(CONFIG_VMGENID) static BLOCKING_NOTIFIER_HEAD(vmfork_chain); -@@ -1459,6 +1538,9 @@ static void try_to_generate_entropy(void) +@@ -1466,6 +1545,9 @@ static void try_to_generate_entropy(void) SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, flags) { @@ -776,7 +776,7 @@ index 3a293f919af9..b3d1b1ad8e97 100644 if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) return -EINVAL; -@@ -1472,6 +1554,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, +@@ -1479,6 +1561,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, if (count > INT_MAX) count = INT_MAX; @@ -795,7 +795,7 @@ index 3a293f919af9..b3d1b1ad8e97 100644 if (!(flags & GRND_INSECURE) && !crng_ready()) { int ret; -@@ -1632,6 +1726,7 @@ static int random_fasync(int fd, struct file *filp, int on) +@@ -1639,6 +1733,7 @@ static int random_fasync(int fd, struct file *filp, int on) } const struct file_operations random_fops = { diff --git a/sources b/sources index a9a211d27..55a2c4c69 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc4-192-g38d741cb70b3074.tar.xz) = b2883cda815ddc68cb9410ff83036038c958e6d4907a1538c19469393702f9c1835475da9a31af81f32dda0cf58feda4703d8e3e590cebdac124b3f479835a13 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220429git38d741cb70b3074.37.tar.bz2) = 7e60a321e1a042d2e1490b2cb5263dfdae02856fe376b246bba3a9bc8e40e4faa0c7b8f77ea4f3c6a9158800f158f31269b627eeecb793006fa49bb4d0d14a05 -SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220429git38d741cb70b3074.37.tar.bz2) = 3906ec328e0b820562cf7a03cd0b51ed7e4c45bb8d2d7139ba62bec99399415e20b9fa6f9459181ccfd34f607fddae56e651703c64e1e3e197ff3a62a44df432 +SHA512 (linux-5.18-rc5.tar.xz) = 6a50216b57ed778cdf89ce3e2701c6ed27a8b0e41fb26836b4f97bb2be6363ece53f9691bdf95ed7978cbd609fa09ee115035d80dd7a1da369bb1dcfaf1d38a1 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.40.tar.bz2) = cddb812f1967e9420f65cc6c05009cfa430e18f01c7853dc45893951eb24cb81d6ccac35d6d286f683398dcef66ec44b7e3a427605e3a5ffc6bd783f11479abd +SHA512 (kernel-kabi-dw-5.18.0-0.rc5.40.tar.bz2) = 7c11f85e21412a71343448d6763ddf8baf4635d4d50b2573cb2355ddf51e9406b25d94e294e56afbf982e7fd51b30d2ca05a675a038806846eb97d5ec51a0dd6 -- cgit