summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec15
-rw-r--r--mod-internal.list1
-rw-r--r--sources6
4 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index f4ad3f49d..cbc71de3a 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 41
+RHEL_RELEASE = 42
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index ed9286e53..5220002d7 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.20211012gitfa5878760579.41
+%global distro_build 0.rc5.20211013gitf4d0cc426f77.42
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.15.0
%define patchversion 5.15
-%define pkgrelease 0.rc5.20211012gitfa5878760579.41
+%define pkgrelease 0.rc5.20211013gitf4d0cc426f77.42
# This is needed to do merge window version magic
%define patchlevel 15
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20211012gitfa5878760579.41%{?buildid}%{?dist}
+%define specrelease 0.rc5.20211013gitf4d0cc426f77.42%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -681,7 +681,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc5-25-gfa5878760579.tar.xz
+Source0: linux-5.15-rc5-39-gf4d0cc426f77.tar.xz
Source1: Makefile.rhelver
@@ -1372,8 +1372,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-rc5-25-gfa5878760579 -c
-mv linux-5.15-rc5-25-gfa5878760579 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc5-39-gf4d0cc426f77 -c
+mv linux-5.15-rc5-39-gf4d0cc426f77 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2976,7 +2976,8 @@ fi
#
#
%changelog
-* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.41]
+* Wed Oct 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211013gitf4d0cc426f77.42]
+- Add kfence_test to mod-internal.list (Justin M. Forbes)
- Temporarily turn off selftests for bpf on ppc (Justin M. Forbes)
* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.40]
diff --git a/mod-internal.list b/mod-internal.list
index f47d01eca..61cd22009 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -22,6 +22,7 @@ rational-test
test_list_sort
slub_kunit
lib_test
+kfence_test
locktorture
mac80211_hwsim
netdevsim
diff --git a/sources b/sources
index d225cd551..00950270b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc5-25-gfa5878760579.tar.xz) = 2789478e400b3655aa0bc2672efc2226f25ce7cafa070e5813229145a7911fb4ca37ef1f48e5eb22ee08d6449660a3466c8cd56b1f20d7ac118d0bd81f5dcbf8
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211012gitfa5878760579.41.tar.bz2) = 953b117ea57e61badd82a2bb1c3fb47a998f8e4ed1e25f3efabcdf41f7079a6fa63db459bee0cdcf4f68cd7c3cc177d5d02ceae94d74036f3470dadaaef977b6
-SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211012gitfa5878760579.41.tar.bz2) = 2d9f7714cf16b40a9001f45b60a13329eaa8e01313fbd682111dc356d9e9634dd6adee8f66eae2704a2f9ff11f43a44246caaadf2e5a235d888624215e2010f1
+SHA512 (linux-5.15-rc5-39-gf4d0cc426f77.tar.xz) = 8756ae3e9d0ebab8b9224e3e08e4a67f9bb1c04abeb76aa018d9b3a229bff6d690fa15925c4e799691b6110f2268f4edf02269da4baed93523e8424ddb44bb17
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211013gitf4d0cc426f77.42.tar.bz2) = 4046dd6edff476308e03b6c9a4a811fca67fc9d7427b17bf67ef3be10b385ee8f1a622c549612921fa68402642d0702d6ddf1bd76a0750032405c15980559134
+SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211013gitf4d0cc426f77.42.tar.bz2) = 6329bb435b8572caba50cb4a5b8fc435637ef1eff69bdac8e99b4cc7e1cc6f46d5da48fa1282ee43118db4d0c3372dd738787acf690496ccb7a4f5058755e6ce