rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.10.0-0.rc4.20240620gite5b3efbe1ab1.41

Browse Source 
* Thu Jun 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.e5b3efbe1ab1.41]
- Linux v6.10.0-0.rc4.e5b3efbe1ab1
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-06-20 11:29:19 -06:00
parent cc52b54f49
commit 303449c06d
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
6 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

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

3
Patchlist.changelog
View File

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/eb75341619677c7f8b6de39e4742a1bcf6569587
eb75341619677c7f8b6de39e4742a1bcf6569587 redhat: make bnx2xx drivers unmaintained in rhel-10
https://gitlab.com/cki-project/kernel-ark/-/commit/6b58b8c1db5679fc8f0bba7d494431cdde1ca696 https://gitlab.com/cki-project/kernel-ark/-/commit/6b58b8c1db5679fc8f0bba7d494431cdde1ca696
6b58b8c1db5679fc8f0bba7d494431cdde1ca696 rh_flags: Rename rh_features to rh_flags 6b58b8c1db5679fc8f0bba7d494431cdde1ca696 rh_flags: Rename rh_features to rh_flags

9
kernel.changelog
View File

@ -1,3 +1,12 @@
* Thu Jun 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.e5b3efbe1ab1.41]
- Linux v6.10.0-0.rc4.e5b3efbe1ab1
Resolves:
* Wed Jun 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.92e5605a199e.40]
- redhat: make bnx2xx drivers unmaintained in rhel-10 (John Meneghini) [RHEL-36646 RHEL-41231]
- Linux v6.10.0-0.rc4.92e5605a199e
Resolves: RHEL-36646, RHEL-41231
* Tue Jun 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.14d7c92f8df9.39] * Tue Jun 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.14d7c92f8df9.39]
- redhat/configs: Disable CONFIG_NFP (Kamal Heib) [RHEL-36647] - redhat/configs: Disable CONFIG_NFP (Kamal Heib) [RHEL-36647]
- Enable CONFIG_PWRSEQ_{SIMPLIE,EMMC} on aarch64 (Charles Mirabile) - Enable CONFIG_PWRSEQ_{SIMPLIE,EMMC} on aarch64 (Charles Mirabile)

13
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.10.0 %define specrpmversion 6.10.0
%define specversion 6.10.0 %define specversion 6.10.0
%define patchversion 6.10 %define patchversion 6.10
%define pkgrelease 0.rc4.20240618git14d7c92f8df9.39 %define pkgrelease 0.rc4.20240620gite5b3efbe1ab1.41
%define kversion 6 %define kversion 6
%define tarfile_release 6.10-rc4-33-g14d7c92f8df9 %define tarfile_release 6.10-rc4-52-ge5b3efbe1ab1
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 10 %define patchlevel 10
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.20240618git14d7c92f8df9.39%{?buildid}%{?dist} %define specrelease 0.rc4.20240620gite5b3efbe1ab1.41%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.10.0 %define kabiversion 6.10.0
@ -4018,6 +4018,13 @@ fi\
# #
# #
%changelog %changelog
* Thu Jun 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.e5b3efbe1ab1.41]
- Linux v6.10.0-0.rc4.e5b3efbe1ab1
* Wed Jun 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.92e5605a199e.40]
- redhat: make bnx2xx drivers unmaintained in rhel-10 (John Meneghini) [RHEL-36646 RHEL-41231]
- Linux v6.10.0-0.rc4.92e5605a199e
* Tue Jun 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.14d7c92f8df9.39] * Tue Jun 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc4.14d7c92f8df9.39]
- redhat/configs: Disable CONFIG_NFP (Kamal Heib) [RHEL-36647] - redhat/configs: Disable CONFIG_NFP (Kamal Heib) [RHEL-36647]
- Enable CONFIG_PWRSEQ_{SIMPLIE,EMMC} on aarch64 (Charles Mirabile) - Enable CONFIG_PWRSEQ_{SIMPLIE,EMMC} on aarch64 (Charles Mirabile)

26
patch-6.10-redhat.patch
View File

@ -66,14 +66,14 @@
kernel/panic.c | 13 + kernel/panic.c | 13 +
kernel/rh_flags.c | 116 +++++ kernel/rh_flags.c | 116 +++++
kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.c | 414 ++++++++++++++++
kernel/rh_messages.h | 319 ++++++++++++ kernel/rh_messages.h | 325 +++++++++++++
scripts/mod/modpost.c | 8 + scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 + scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +- security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 12 + security/security.c | 12 +
75 files changed, 2518 insertions(+), 207 deletions(-) 75 files changed, 2524 insertions(+), 207 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 11e57ba2985c..7daa07578cff 100644 index 11e57ba2985c..7daa07578cff 100644
@ -2387,7 +2387,7 @@ index be2e8c0a187e..114e213c89e2 100644
+ +
#endif #endif
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
index f804b76cde44..0c99deb19b47 100644 index 44488b1ab9a9..f76c91083b0f 100644
--- a/include/linux/lsm_hook_defs.h --- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h
@@ -437,6 +437,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -437,6 +437,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
@ -3100,7 +3100,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport); int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h diff --git a/include/linux/security.h b/include/linux/security.h
index 21cf70346b33..acb8ced06b01 100644 index de3af33e6ff5..0a37270070e4 100644
--- a/include/linux/security.h --- a/include/linux/security.h
+++ b/include/linux/security.h +++ b/include/linux/security.h
@@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@ -3839,10 +3839,10 @@ index 000000000000..bb69e8965748
+} +}
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
new file mode 100644 new file mode 100644
index 000000000000..5c44026c6c81 index 000000000000..3ac7e00e0def
--- /dev/null --- /dev/null
+++ b/kernel/rh_messages.h +++ b/kernel/rh_messages.h
@@ -0,0 +1,319 @@ @@ -0,0 +1,325 @@
+/* +/*
+ * WARNING: This file is auto-generated by an internal Red Hat script and, + * WARNING: This file is auto-generated by an internal Red Hat script and,
+ * in general, should not be modified by hand. + * in general, should not be modified by hand.
@ -3904,6 +3904,10 @@ index 000000000000..5c44026c6c81
+ "af_key", + "af_key",
+ "arp_tables", + "arp_tables",
+ "bnx2", + "bnx2",
+ "bnx2fc",
+ "bnx2i",
+ "bnx2x",
+ "cnic",
+ "dl2k", + "dl2k",
+ "e1000", + "e1000",
+ "ebtables", + "ebtables",
@ -3923,7 +3927,6 @@ index 000000000000..5c44026c6c81
+ "nicvf", + "nicvf",
+ "nvmet-fc", + "nvmet-fc",
+ "nvmet-tcp", + "nvmet-tcp",
+ "qla3xxx",
+ "team", + "team",
+ 0 /* Terminating entry */ + 0 /* Terminating entry */
+}; +};
@ -3939,7 +3942,6 @@ index 000000000000..5c44026c6c81
+ "mptspi_init", + "mptspi_init",
+ "myri10ge_init_module", + "myri10ge_init_module",
+ "netxen_init_module", + "netxen_init_module",
+ "ql3xxx_driver_init",
+ "hdlc_fr_init", + "hdlc_fr_init",
+ "nvmet_fc_init_module", + "nvmet_fc_init_module",
+ "nvmet_tcp_init", + "nvmet_tcp_init",
@ -3954,6 +3956,10 @@ index 000000000000..5c44026c6c81
+ "nic_init_module", + "nic_init_module",
+ "ipsec_pfkey_init", + "ipsec_pfkey_init",
+ "aac_init", + "aac_init",
+ "cnic_init",
+ "bnx2x_init",
+ "bnx2fc_mod_init",
+ "bnx2i_mod_init",
+ 0 /* Terminating entry */ + 0 /* Terminating entry */
+}; +};
+ +
@ -4269,10 +4275,10 @@ index cd84d8ea1dfb..e4c70a0312bc 100644
const struct lsm_id lockdown_lsmid = { const struct lsm_id lockdown_lsmid = {
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index e5da848c50b9..f2bc5810c4b7 100644 index e5ca08789f74..7032265d85ba 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -5568,6 +5568,18 @@ int security_locked_down(enum lockdown_reason what) @@ -5570,6 +5570,18 @@ int security_locked_down(enum lockdown_reason what)
} }
EXPORT_SYMBOL(security_locked_down); EXPORT_SYMBOL(security_locked_down);

6
sources
View File

@ -1,5 +1,5 @@
SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
SHA512 (linux-6.10-rc4-33-g14d7c92f8df9.tar.xz) = 59ecc724b87bd0a0b5075458be37d149031ac087ce7e6f2416db9d2f978a5f6747e105cdd0f5c464724cb567a5568411a7221a94d30b53cbc1d82b26449add36 SHA512 (linux-6.10-rc4-52-ge5b3efbe1ab1.tar.xz) = 8eee4ca9047a0b9c57d3731c3f14d4f0c0a62ba7008900784431f0c72169de5c9d8a8131d2b349919c4e70d02d3fd06e58900c158614b4da45a6abcb4b05234d
SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = dc9f8d1883c62d378a351569380cc3fb4f5ae13f3951d66f66ca946928720b3102eafa9d49a8b7e1a1286d5368f295de954cdd9f1361c1ef491785d881b82700 SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = ca3236026aa891a990ee904266cdcfb84c457f14933ce037a38902c27131c3d592eb65ff05facaba29b4137868bb737bfc5375235e5363a131bf82a53408c5ab
SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 27a57cbde90b2f5606ede02ac30c917cb1231b53a43ea123500584e17e30862fbcf9d7d7182b0b8983dfcc97745eaab472322b02a307d6f3904c4266807e81a0 SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 5b8f7852654037615b529a6e08d72e8ecc09f757a261678140a7332f6c18f15852ac0e416e7aaee7134b932687bc155ef4d0a55e38f6523c4c90490a7be3a444