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

kernel-6.11.0-0.rc1.20240729gitdc1c8034e31b.16

Browse Source 
* Mon Jul 29 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.dc1c8034e31b.16]
- 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-07-29 07:51:54 -06:00
parent 03ef585681
commit 59bca04dad
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
31 changed files with 71 additions and 57 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.
# Do not trim this comment.
RHEL_RELEASE = 14
RHEL_RELEASE = 16
#
# RHEL_REBASE_NUM

3
Patchlist.changelog
View File

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/38fda603cbe1d8e6158f027bcf5119813f4043b3
38fda603cbe1d8e6158f027bcf5119813f4043b3 [redhat] rh_flags: constify the ctl_table argument of proc_handler
https://gitlab.com/cki-project/kernel-ark/-/commit/6fd960759f97a5d7638604bf050268d3019d079d
6fd960759f97a5d7638604bf050268d3019d079d redhat: rh_flags: declare proper static methods when !CONFIG_RHEL_DIFFERENCES

3
kernel-aarch64-16k-debug-fedora.config
View File

@ -1380,6 +1380,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
@ -6656,7 +6657,7 @@ CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
CONFIG_REGULATOR_RZG2L_VBCTRL=y
CONFIG_REGULATOR_RZG2L_VBCTRL=m
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SUN20I is not set
CONFIG_REGULATOR_SY7636A=m

3
kernel-aarch64-16k-fedora.config
View File

@ -1380,6 +1380,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
@ -6629,7 +6630,7 @@ CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
CONFIG_REGULATOR_RZG2L_VBCTRL=y
CONFIG_REGULATOR_RZG2L_VBCTRL=m
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SUN20I is not set
CONFIG_REGULATOR_SY7636A=m

1
kernel-aarch64-64k-debug-rhel.config
View File

@ -1041,6 +1041,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-aarch64-64k-rhel.config
View File

@ -1041,6 +1041,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

3
kernel-aarch64-debug-fedora.config
View File

@ -1380,6 +1380,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
@ -6655,7 +6656,7 @@ CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
CONFIG_REGULATOR_RZG2L_VBCTRL=y
CONFIG_REGULATOR_RZG2L_VBCTRL=m
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SUN20I is not set
CONFIG_REGULATOR_SY7636A=m

1
kernel-aarch64-debug-rhel.config
View File

@ -1039,6 +1039,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

3
kernel-aarch64-fedora.config
View File

@ -1380,6 +1380,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
@ -6628,7 +6629,7 @@ CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
CONFIG_REGULATOR_RZG2L_VBCTRL=y
CONFIG_REGULATOR_RZG2L_VBCTRL=m
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SUN20I is not set
CONFIG_REGULATOR_SY7636A=m

1
kernel-aarch64-rhel.config
View File

@ -1039,6 +1039,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-aarch64-rt-debug-rhel.config
View File

@ -1039,6 +1039,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-aarch64-rt-rhel.config
View File

@ -1039,6 +1039,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-ppc64le-debug-fedora.config
View File

@ -999,6 +999,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-ppc64le-debug-rhel.config
View File

@ -860,6 +860,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-ppc64le-fedora.config
View File

@ -997,6 +997,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-ppc64le-rhel.config
View File

@ -860,6 +860,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-s390x-debug-fedora.config
View File

@ -1007,6 +1007,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-s390x-debug-rhel.config
View File

@ -861,6 +861,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-s390x-fedora.config
View File

@ -1005,6 +1005,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-s390x-rhel.config
View File

@ -861,6 +861,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-s390x-zfcpdump-rhel.config
View File

@ -862,6 +862,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
# CONFIG_CONNECTOR is not set
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-debug-fedora.config
View File

@ -1070,6 +1070,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-debug-rhel.config
View File

@ -891,6 +891,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-fedora.config
View File

@ -1068,6 +1068,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-rhel.config
View File

@ -891,6 +891,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-rt-debug-rhel.config
View File

@ -891,6 +891,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

1
kernel-x86_64-rt-rhel.config
View File

@ -891,6 +891,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
# CONFIG_COMPRESSED_INSTALL is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7

11
kernel.changelog
View File

@ -1,7 +1,16 @@
* Fri Jul 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.1722389b0d86.14]
* Mon Jul 29 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.dc1c8034e31b.16]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
Resolves:
* Mon Jul 29 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.dc1c8034e31b.15]
- fedora: set CONFIG_REGULATOR_RZG2L_VBCTRL as a module for arm64 (Patrick Talbert)
- Linux v6.11.0-0.rc1.dc1c8034e31b
Resolves:
* Sat Jul 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.3a7e02c040b1.14]
- Linux v6.11.0-0.rc0.3a7e02c040b1
Resolves:
* Fri Jul 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.1722389b0d86.13]
- gitlab-ci: restore bot pipeline behavior (Michael Hofmann)
- redhat/kernel.spec: drop extra right curly bracket in kernel_kvm_package (Jan Stancek)

15
kernel.spec
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.rc0.20240726git1722389b0d86.14
%define pkgrelease 0.rc1.20240729gitdc1c8034e31b.16
%define kversion 6
%define tarfile_release 6.10-12562-g1722389b0d86
%define tarfile_release 6.11-rc1-4-gdc1c8034e31b
# This is needed to do merge window version magic
%define patchlevel 11
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20240726git1722389b0d86.14%{?buildid}%{?dist}
%define specrelease 0.rc1.20240729gitdc1c8034e31b.16%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.11.0
@ -4043,9 +4043,16 @@ fi\
#
#
%changelog
* Fri Jul 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.1722389b0d86.14]
* Mon Jul 29 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.dc1c8034e31b.16]
- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
* Mon Jul 29 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.dc1c8034e31b.15]
- fedora: set CONFIG_REGULATOR_RZG2L_VBCTRL as a module for arm64 (Patrick Talbert)
- Linux v6.11.0-0.rc1.dc1c8034e31b
* Sat Jul 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.3a7e02c040b1.14]
- Linux v6.11.0-0.rc0.3a7e02c040b1
* Fri Jul 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc0.1722389b0d86.13]
- gitlab-ci: restore bot pipeline behavior (Michael Hofmann)
- redhat/kernel.spec: drop extra right curly bracket in kernel_kvm_package (Jan Stancek)

58
patch-6.11-redhat.patch
View File

@ -78,10 +78,10 @@
77 files changed, 2528 insertions(+), 257 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index c1134ad5f06d..11c615af1e11 100644
index f1384c7b59c9..0f783e70d4c3 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6970,6 +6970,15 @@
@@ -6967,6 +6967,15 @@
unknown_nmi_panic
[X86] Cause panic on unknown NMI.
@ -140,7 +140,7 @@ index 000000000000..7465c78a90e6
+
+endmenu
diff --git a/Makefile b/Makefile
index 11e74386d909..68674e4bc5aa 100644
index 8ad55d6e7b60..6f2aaa2c9efb 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -162,7 +162,7 @@ index 11e74386d909..68674e4bc5aa 100644
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -1242,7 +1254,13 @@ define filechk_version.h
@@ -1241,7 +1253,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@ -194,7 +194,7 @@ index 954a1916a500..205966cc405a 100644
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
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7fd70be0463f..417518904abc 100644
index b3fc891f1544..260e8329ba30 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1355,7 +1355,7 @@ endchoice
@ -219,7 +219,7 @@ index b0d00032479d..afb9544fb007 100644
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 3a7d6e172211..8163a2173247 100644
index f17bb7bf9392..66e530380ee3 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report)
@ -232,7 +232,7 @@ index 3a7d6e172211..8163a2173247 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 3993f4caf224..1d5e4e9ad0cb 100644
index 4ec99f73fa27..26d0037de1dd 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@ -243,7 +243,7 @@ index 3993f4caf224..1d5e4e9ad0cb 100644
#include <linux/hugetlb.h>
#include <linux/kmemleak.h>
@@ -891,6 +892,9 @@ void __init setup_arch(char **cmdline_p)
@@ -894,6 +895,9 @@ void __init setup_arch(char **cmdline_p)
log_component_list();
@ -1759,7 +1759,7 @@ index a00671b58701..eeef2766b8b3 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 19917253ba7b..e065384d8435 100644
index 053d5b4909cd..20f09734d6e0 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -2278,10 +2278,10 @@ index a14f6013e316..6c20453fdf76 100644
error_proc:
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 35268263aaed..39abdda19809 100644
index 32ce5b35e1df..eb0d6e5822fd 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -580,6 +580,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -595,6 +595,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
{
struct inode *inode;
struct erofs_sb_info *sbi = EROFS_SB(sb);
@ -2291,7 +2291,7 @@ index 35268263aaed..39abdda19809 100644
int err;
sb->s_magic = EROFS_SUPER_MAGIC;
@@ -685,6 +688,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -701,6 +704,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
return err;
erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid);
@ -3342,7 +3342,7 @@ index f861bedc1925..3b474ad6a6a7 100644
#undef TAINT_FLAG
diff --git a/kernel/rh_flags.c b/kernel/rh_flags.c
new file mode 100644
index 000000000000..b98c81d917ca
index 000000000000..cca2275bb58f
--- /dev/null
+++ b/kernel/rh_flags.c
@@ -0,0 +1,116 @@
@ -3416,7 +3416,7 @@ index 000000000000..b98c81d917ca
+EXPORT_SYMBOL(rh_print_flags);
+
+#ifdef CONFIG_SYSCTL
+static int rh_flags_show(struct ctl_table *ctl, int write,
+static int rh_flags_show(const struct ctl_table *ctl, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos)
+{
@ -4396,33 +4396,3 @@ index 8cee5b6c6e6d..489e25946bf9 100644
#ifdef CONFIG_PERF_EVENTS
/**
* security_perf_event_open() - Check if a perf event open is allowed
From 38fda603cbe1d8e6158f027bcf5119813f4043b3 Mon Sep 17 00:00:00 2001
From: Scott Weaver <scweaver@redhat.com>
Date: Fri, 26 Jul 2024 08:51:44 -0400
Subject: [PATCH] [redhat] rh_flags: constify the ctl_table argument of
proc_handler
With 78eb4ea25cd5f ('sysctl: treewide: constify the ctl_table argument
of proc_handlers') some RHEL only code will also need updated.
Signed-off-by: Scott Weaver <scweaver@redhat.com>
---
kernel/rh_flags.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/rh_flags.c b/kernel/rh_flags.c
index b98c81d917caa..cca2275bb58f1 100644
--- a/kernel/rh_flags.c
+++ b/kernel/rh_flags.c
@@ -68,7 +68,7 @@ void rh_print_flags(void)
EXPORT_SYMBOL(rh_print_flags);
#ifdef CONFIG_SYSCTL
-static int rh_flags_show(struct ctl_table *ctl, int write,
+static int rh_flags_show(const struct ctl_table *ctl, int write,
void __user *buffer, size_t *lenp,
loff_t *ppos)
{
--
GitLab

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.10-12562-g1722389b0d86.tar.xz) = d5b699352bfa644bdce8126e254106ac1315581dba9dab894807dfbf67fde92e61349b3d86e60e82ce4a53117b8a656bbf88f28cd30f7b0e6b23d1a6d3287b95
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e55552cd89e1d2d440b7449331b35b1e7556ff89c6c1b791c3fc969b35b8867de10f5db05a636aa10dd35d517ee446de76d3df81c202b3c2fa2054c2bace2d78
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 6674302533896c1c8a73eb781105377696d0b40c2155070faa89f6bde84654c26cfba12d59db5edffb78c40b76a4665c9e8978568eb2a17caf5ceb80156667e6
SHA512 (linux-6.11-rc1-4-gdc1c8034e31b.tar.xz) = c56381af2bdca44e9d897a07a79af7d9ac217a683a72a8357972268271e399fc5307b197a7aad90fd73ec15586a45a87a5941991cdb80e40064346b892b9cbc0
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 48354f8509484b6a88dd1752b01d390208af7807aae855c4699076fddd47886bb51e5980b3a1466c35304f51b65e8dae1c2c5bddd1fc759b5f1985e0ac3fb7ba
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = fc632aaee40305db00566453c3f466128bdf7a667eb0406ba5748b568b788792ad53a65650b72a3b94ad85ee74c18f4172f38f6e76fd3d25eace86a47d64ac12