kernel-6.11.0-0.rc4.20240820git6e4436539ae1.38

* Tue Aug 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.6e4436539ae1.38]
- Add weakdep support to the kernel spec (Justin M. Forbes)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-08-20 14:41:09 -06:00
parent 2d4b295a03
commit 8199fed87e
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
5 changed files with 24 additions and 14 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 37
RHEL_RELEASE = 38
#
# RHEL_REBASE_NUM

View File

@ -1,5 +1,10 @@
* Mon Aug 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.37]
* Tue Aug 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.6e4436539ae1.38]
- Add weakdep support to the kernel spec (Justin M. Forbes)
Resolves:
* Tue Aug 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.6e4436539ae1.37]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
- Linux v6.11.0-0.rc4.6e4436539ae1
Resolves:
* Mon Aug 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.36]

View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.11.0
%define specversion 6.11.0
%define patchversion 6.11
%define pkgrelease 0.rc4.37
%define pkgrelease 0.rc4.20240820git6e4436539ae1.38
%define kversion 6
%define tarfile_release 6.11-rc4
%define tarfile_release 6.11-rc4-8-g6e4436539ae1
# This is needed to do merge window version magic
%define patchlevel 11
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.37%{?buildid}%{?dist}
%define specrelease 0.rc4.20240820git6e4436539ae1.38%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.11.0
@ -2793,7 +2793,7 @@ BuildKernel() {
# in case below list needs to be extended, remember to add a
# matching ghost entry in the files section as well
rm -f modules.{alias,alias.bin,builtin.alias.bin,builtin.bin} \
modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin}
modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin,weakdep}
popd
}
@ -3991,6 +3991,7 @@ fi\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.softdep\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols.bin\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.weakdep\
%{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
%{expand:%%files %{?3:%{3}-}devel}\
%defverify(not mtime)\
@ -4097,8 +4098,12 @@ fi\
#
#
%changelog
* Mon Aug 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.37]
* Tue Aug 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.6e4436539ae1.38]
- Add weakdep support to the kernel spec (Justin M. Forbes)
* Tue Aug 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.6e4436539ae1.37]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
- Linux v6.11.0-0.rc4.6e4436539ae1
* Mon Aug 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc4.36]
- Linux v6.11.0-0.rc4

View File

@ -2528,10 +2528,10 @@ index 88ecc5e9f523..bcc0377c716a 100644
+
#endif /* _LINUX_MODULE_H */
diff --git a/include/linux/panic.h b/include/linux/panic.h
index 3130e0b5116b..2b51f6eefcd6 100644
index 54d90b6c5f47..cc5def6f2b2e 100644
--- a/include/linux/panic.h
+++ b/include/linux/panic.h
@@ -73,7 +73,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)
@@ -74,7 +74,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)
#define TAINT_AUX 16
#define TAINT_RANDSTRUCT 17
#define TAINT_TEST 18
@ -3404,10 +3404,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644
int module_sig_check(struct load_info *info, int flags)
diff --git a/kernel/panic.c b/kernel/panic.c
index f861bedc1925..3b474ad6a6a7 100644
index 2a0449144f82..a8feef83d920 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -502,6 +502,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
@@ -508,6 +508,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
TAINT_FLAG(AUX, 'X', ' ', true),
TAINT_FLAG(RANDSTRUCT, 'T', ' ', true),
TAINT_FLAG(TEST, 'N', ' ', true),

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.11-rc4.tar.xz) = 30bdb3101583da58ebb06a52227d76216382874b4dbd5248dbbc9413d6ac223345a99fa00d3f088625c7402e55142828a019a61ad8ef431a144a84e6c21821c5
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d311b0e6a80215acaecb0c6329d1315214402fdf09fcd9b75f67f772ce3b8f9f0334f9e3a7d10ce7f3e21e385d9c2a9735451d750adc6737e54ba3fad7407791
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ab11eb70b0fa046a4ce50bc6ecf4a3f650969a8b7f5d15ee41ee8f592b3d6d138959b1fd2a1edc288b9ed7e42068b095ff3f8bff17d571fbe8c329e94fefd682
SHA512 (linux-6.11-rc4-8-g6e4436539ae1.tar.xz) = a970dd078f688e415e7ae0779a13904e0a56f621ec53d50c1d5c77133da149e412f4d1e69d86a6c8a2245b1c2e9f134ce6891238adab8a0ae0fe4809ac9e169c
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 78a838fc472bfeb5f0e182ccd7c91098373df4b189e56ba487ad26e883f66090297bc0991952b5309a6d9d76c4c2e935d66b44c4a68964462227ea0fa8b9843e
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 9b28bd11a126809d49ff48c3fa326d494e31fc07683ccaa00e4e0cc31bcfdc055a4099d784a0a0a9d23171d552fbdc3ab5323934a09b46c94d9500b7bc47b70c