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

kernel-6.11.0-0.rc2.23

Browse Source 
* Mon Aug 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc2.23]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-08-05 09:14:47 -06:00
parent 62df7a1296
commit fd0e7232cd
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
6 changed files with 47 additions and 22 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 = 20 RHEL_RELEASE = 23
# #
# RHEL_REBASE_NUM # RHEL_REBASE_NUM

3
Patchlist.changelog
View File

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/ea1b0021eef49f13c5a0ccf1e2e1e506a9992250
ea1b0021eef49f13c5a0ccf1e2e1e506a9992250 rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel
https://gitlab.com/cki-project/kernel-ark/-/commit/38fda603cbe1d8e6158f027bcf5119813f4043b3 https://gitlab.com/cki-project/kernel-ark/-/commit/38fda603cbe1d8e6158f027bcf5119813f4043b3
38fda603cbe1d8e6158f027bcf5119813f4043b3 [redhat] rh_flags: constify the ctl_table argument of proc_handler 38fda603cbe1d8e6158f027bcf5119813f4043b3 [redhat] rh_flags: constify the ctl_table argument of proc_handler

15
kernel.changelog
View File

@ -1,7 +1,20 @@
* Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.20] * Mon Aug 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc2.23]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
Resolves: Resolves:
* Mon Aug 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc2.22]
- rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel (Ricardo Robaina) [RHEL-52629]
- Linux v6.11.0-0.rc2
Resolves: RHEL-52629
* Sun Aug 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.defaf1a2113a.21]
- Linux v6.11.0-0.rc1.defaf1a2113a
Resolves:
* Sat Aug 03 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.17712b7ea075.20]
- Linux v6.11.0-0.rc1.17712b7ea075
Resolves:
* Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.19] * Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.19]
- redhat/dracut-virt.conf: add systemd-veritysetup module (Emanuele Giuseppe Esposito) - redhat/dracut-virt.conf: add systemd-veritysetup module (Emanuele Giuseppe Esposito)
- Linux v6.11.0-0.rc1.c0ecd6388360 - Linux v6.11.0-0.rc1.c0ecd6388360

18
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.11.0 %define specrpmversion 6.11.0
%define specversion 6.11.0 %define specversion 6.11.0
%define patchversion 6.11 %define patchversion 6.11
%define pkgrelease 0.rc1.20240802gitc0ecd6388360.20 %define pkgrelease 0.rc2.23
%define kversion 6 %define kversion 6
%define tarfile_release 6.11-rc1-154-gc0ecd6388360 %define tarfile_release 6.11-rc2
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 11 %define patchlevel 11
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc1.20240802gitc0ecd6388360.20%{?buildid}%{?dist} %define specrelease 0.rc2.23%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.11.0 %define kabiversion 6.11.0
@ -4046,9 +4046,19 @@ fi\
# #
# #
%changelog %changelog
* Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.20] * Mon Aug 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc2.23]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
* Mon Aug 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc2.22]
- rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel (Ricardo Robaina) [RHEL-52629]
- Linux v6.11.0-0.rc2
* Sun Aug 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.defaf1a2113a.21]
- Linux v6.11.0-0.rc1.defaf1a2113a
* Sat Aug 03 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.17712b7ea075.20]
- Linux v6.11.0-0.rc1.17712b7ea075
* Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.19] * Fri Aug 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.c0ecd6388360.19]
- redhat/dracut-virt.conf: add systemd-veritysetup module (Emanuele Giuseppe Esposito) - redhat/dracut-virt.conf: add systemd-veritysetup module (Emanuele Giuseppe Esposito)
- Linux v6.11.0-0.rc1.c0ecd6388360 - Linux v6.11.0-0.rc1.c0ecd6388360

25
patch-6.11-redhat.patch
View File

@ -65,7 +65,7 @@
kernel/module/main.c | 13 + kernel/module/main.c | 13 +
kernel/module/signing.c | 9 +- kernel/module/signing.c | 9 +-
kernel/panic.c | 13 + kernel/panic.c | 13 +
kernel/rh_flags.c | 116 +++++ kernel/rh_flags.c | 115 +++++
kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.c | 414 ++++++++++++++++
kernel/rh_messages.h | 325 +++++++++++++ kernel/rh_messages.h | 325 +++++++++++++
scripts/mod/modpost.c | 8 + scripts/mod/modpost.c | 8 +
@ -75,13 +75,13 @@
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 +
77 files changed, 2528 insertions(+), 257 deletions(-) 77 files changed, 2527 insertions(+), 257 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 f1384c7b59c9..0f783e70d4c3 100644 index 09126bb8cc9f..0a68fc52e2fb 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6967,6 +6967,15 @@ @@ -6965,6 +6965,15 @@
unknown_nmi_panic unknown_nmi_panic
[X86] Cause panic on unknown NMI. [X86] Cause panic on unknown NMI.
@ -140,7 +140,7 @@ index 000000000000..7465c78a90e6
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8ad55d6e7b60..6f2aaa2c9efb 100644 index 44c02a6f60a1..721338014e72 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -194,10 +194,10 @@ index 54b2bb817a7f..0415b853e1af 100644
The VM uses one page of physical memory for each page table. The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b3fc891f1544..260e8329ba30 100644 index a2f8ff354ca6..e185f3e75a5c 100644
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1355,7 +1355,7 @@ endchoice @@ -1365,7 +1365,7 @@ endchoice
config ARM64_FORCE_52BIT config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace" bool "Force 52-bit virtual addresses for userspace"
@ -266,7 +266,7 @@ index d4e539d4e158..ed3a7b089b87 100644
get_cpu_address_sizes(c); get_cpu_address_sizes(c);
cpu_parse_early_param(); cpu_parse_early_param();
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 5d34cad9b7b1..4145918a84ce 100644 index 6129dc2ba784..070aa96cfadd 100644
--- a/arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -2215,7 +2215,7 @@ index 17cccd14765f..7f0cef737224 100644
}; };
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index adeaa8ab9951..6bdc4644a0f0 100644 index 8bb3a3611851..d81d85c6c0de 100644
--- a/drivers/scsi/sd.c --- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -122,6 +122,14 @@ static const char *sd_cache_types[] = { @@ -122,6 +122,14 @@ static const char *sd_cache_types[] = {
@ -2233,7 +2233,7 @@ index adeaa8ab9951..6bdc4644a0f0 100644
static void sd_set_flush_flag(struct scsi_disk *sdkp, static void sd_set_flush_flag(struct scsi_disk *sdkp,
struct queue_limits *lim) struct queue_limits *lim)
{ {
@@ -4338,6 +4346,11 @@ static int __init init_sd(void) @@ -4339,6 +4347,11 @@ static int __init init_sd(void)
goto err_out_class; goto err_out_class;
} }
@ -3342,10 +3342,10 @@ index f861bedc1925..3b474ad6a6a7 100644
#undef TAINT_FLAG #undef TAINT_FLAG
diff --git a/kernel/rh_flags.c b/kernel/rh_flags.c diff --git a/kernel/rh_flags.c b/kernel/rh_flags.c
new file mode 100644 new file mode 100644
index 000000000000..cca2275bb58f index 000000000000..10d26958f840
--- /dev/null --- /dev/null
+++ b/kernel/rh_flags.c +++ b/kernel/rh_flags.c
@@ -0,0 +1,116 @@ @@ -0,0 +1,115 @@
+#include <linux/kernel.h> +#include <linux/kernel.h>
+#include <linux/list.h> +#include <linux/list.h>
+#include <linux/proc_fs.h> +#include <linux/proc_fs.h>
@ -3450,7 +3450,6 @@ index 000000000000..cca2275bb58f
+ .mode = 0444, + .mode = 0444,
+ .proc_handler = rh_flags_show, + .proc_handler = rh_flags_show,
+ }, + },
+ { }
+}; +};
+#endif +#endif
+ +

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.11-rc1-154-gc0ecd6388360.tar.xz) = 1157750428ab964862821113261d4c73c065c5b11b261d8b3195def081447b1914c5b4231531da5541eb6aed8cc9ce6caafb9ca71a1832491c0da5ffabce7925 SHA512 (linux-6.11-rc2.tar.xz) = 16361c52d4ebd0a03853df43a1cc08f11623d1f39d29e00f49a1505177b9e3900709d67c35c419fd3192f2a89a83a5c8bc284a2cb81db2c18700ff45ffdcfdaf
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = ceab61385fa8283f5e87b335de7aaf93f57e28090f8490eaef6b3f7cc5341b64850d106c6f7602744fa927ee59cd0a0892e3e01025e7bc54d45aecd4dea60a00 SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 126ed4411de6559f069020da5433b07ee940be86c6036766034d1f8744d7293630281c08fdfe841357232b598b14d5d8938711494c6bf10f367ba846f27e1403
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 70e2ddc83a2a3b79f198044c44a6841b6916cddce4f16620f75eb2fca466f38dbc918b32ade9b433be3b215d43ef57ee8f9ff14d276125783ae15dd18866ef9e SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 50513c517ba3e37c7af0381366519267e227863e3d4ab0b658632608cc02bc7286010c965d8bbe576d18dae89db39165fff8d1623a68380656ad23d0e7909492