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

kernel-6.12.0-0.rc0.20240925git684a64bf32b6.12

Browse Source 
* Wed Sep 25 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc0.684a64bf32b6.12]
- Revert "Merge branch 'drop_engine_api' into 'os-build'" (Justin M. Forbes)
- Linux v6.12.0-0.rc0.684a64bf32b6
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-09-25 09:05:34 -06:00
parent 28b3da71f8
commit bb85c00ca4
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
33 changed files with 101 additions and 122 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 = 11
RHEL_RELEASE = 12
#
# RHEL_REBASE_NUM

3
Patchlist.changelog
View File

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21
77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'"
https://gitlab.com/cki-project/kernel-ark/-/commit/e17bc3ed0c14face0de1eea5553a7786538e9ce6
e17bc3ed0c14face0de1eea5553a7786538e9ce6 redhat: fix bad merge

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

@ -4857,6 +4857,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -5508,6 +5509,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -9002,6 +9004,7 @@ CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
CONFIG_TI_K3_DSP_REMOTEPROC=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_K3_R5_REMOTEPROC=m
CONFIG_TI_K3_RINGACC=y
CONFIG_TI_K3_SOCINFO=y

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

@ -4831,6 +4831,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -5482,6 +5483,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -8973,6 +8975,7 @@ CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
CONFIG_TI_K3_DSP_REMOTEPROC=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_K3_R5_REMOTEPROC=m
CONFIG_TI_K3_RINGACC=y
CONFIG_TI_K3_SOCINFO=y

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

@ -4031,6 +4031,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4516,6 +4517,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4010,6 +4010,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4495,6 +4496,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4857,6 +4857,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -5508,6 +5509,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -9001,6 +9003,7 @@ CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
CONFIG_TI_K3_DSP_REMOTEPROC=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_K3_R5_REMOTEPROC=m
CONFIG_TI_K3_RINGACC=y
CONFIG_TI_K3_SOCINFO=y

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

@ -4028,6 +4028,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4513,6 +4514,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

3
kernel-aarch64-fedora.config
View File

@ -4831,6 +4831,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -5482,6 +5483,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -8972,6 +8974,7 @@ CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
CONFIG_TI_K3_DSP_REMOTEPROC=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_K3_R5_REMOTEPROC=m
CONFIG_TI_K3_RINGACC=y
CONFIG_TI_K3_SOCINFO=y

2
kernel-aarch64-rhel.config
View File

@ -4007,6 +4007,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4492,6 +4493,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4068,6 +4068,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4553,6 +4554,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4047,6 +4047,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4532,6 +4533,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4006,6 +4006,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4608,6 +4609,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7377,6 +7379,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

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

@ -3690,6 +3690,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4156,6 +4157,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

3
kernel-ppc64le-fedora.config
View File

@ -3978,6 +3978,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4580,6 +4581,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7346,6 +7348,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

2
kernel-ppc64le-rhel.config
View File

@ -3670,6 +3670,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4136,6 +4137,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4017,6 +4017,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4626,6 +4627,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7445,6 +7447,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

3
kernel-riscv64-fedora.config
View File

@ -3989,6 +3989,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4598,6 +4599,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7414,6 +7416,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

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

@ -3977,6 +3977,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4575,6 +4576,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7299,6 +7301,7 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

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

@ -3669,6 +3669,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4132,6 +4133,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

3
kernel-s390x-fedora.config
View File

@ -3949,6 +3949,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4547,6 +4548,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7268,6 +7270,7 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

2
kernel-s390x-rhel.config
View File

@ -3649,6 +3649,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4112,6 +4113,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -3658,6 +3658,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4123,6 +4124,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -4373,6 +4373,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4989,6 +4990,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7885,6 +7887,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

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

@ -3900,6 +3900,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4373,6 +4374,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

3
kernel-x86_64-fedora.config
View File

@ -4347,6 +4347,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4963,6 +4964,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFS_SWAP=y
@ -7855,6 +7857,7 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TI_K3_M4_REMOTEPROC is not set
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y

2
kernel-x86_64-rhel.config
View File

@ -3880,6 +3880,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4353,6 +4354,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -3940,6 +3940,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4413,6 +4414,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

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

@ -3920,6 +3920,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_FOCALTECH=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_PIXART=y
CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
@ -4393,6 +4394,7 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFS_FS=m
# CONFIG_NFS_LOCALIO is not set
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_SOCKET_IPV6=m
# CONFIG_NFS_SWAP is not set

5
kernel.changelog
View File

@ -1,3 +1,8 @@
* Wed Sep 25 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc0.684a64bf32b6.12]
- Revert "Merge branch 'drop_engine_api' into 'os-build'" (Justin M. Forbes)
- Linux v6.12.0-0.rc0.684a64bf32b6
Resolves:
* Tue Sep 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc0.abf2050f51fd.11]
- Linux v6.12.0-0.rc0.abf2050f51fd
Resolves:

12
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0
%define specversion 6.12.0
%define patchversion 6.12
%define pkgrelease 0.rc0.20240924gitabf2050f51fd.11
%define pkgrelease 0.rc0.20240925git684a64bf32b6.12
%define kversion 6
%define tarfile_release 6.11-9959-gabf2050f51fd
%define tarfile_release 6.11-10547-g684a64bf32b6
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20240924gitabf2050f51fd.11%{?buildid}%{?dist}
%define specrelease 0.rc0.20240925git684a64bf32b6.12%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0
@ -648,7 +648,7 @@ Summary: The Linux kernel
Name: %{package_name}
License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0) AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later) AND CC0-1.0
License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND 0BSD AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0) AND BSD-3-Clause AND BSD-3-Clause-Clear AND CC0-1.0 AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later)
URL: https://www.kernel.org/
Version: %{specrpmversion}
Release: %{pkg_release}
@ -4136,6 +4136,10 @@ fi\
#
#
%changelog
* Wed Sep 25 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc0.684a64bf32b6.12]
- Revert "Merge branch 'drop_engine_api' into 'os-build'" (Justin M. Forbes)
- Linux v6.12.0-0.rc0.684a64bf32b6
* Tue Sep 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc0.abf2050f51fd.11]
- Linux v6.12.0-0.rc0.abf2050f51fd

129
patch-6.12-redhat.patch
View File

@ -10,7 +10,6 @@
arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/cpu/common.c | 1 +
arch/x86/kernel/setup.c | 98 +++-
certs/extract-cert.c | 25 +-
crypto/akcipher.c | 6 +-
crypto/dh.c | 25 +
crypto/drbg.c | 18 +-
@ -77,13 +76,12 @@
kernel/rh_messages.h | 325 +++++++++++++
kernel/rh_waived.c | 104 ++++
scripts/mod/modpost.c | 8 +
scripts/sign-file.c | 29 +-
scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 12 +
85 files changed, 2762 insertions(+), 266 deletions(-)
83 files changed, 2758 insertions(+), 216 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bb48ae24ae69..1cb684b57e11 100644
@ -193,7 +191,7 @@ index 000000000000..7465c78a90e6
+
+endmenu
diff --git a/Makefile b/Makefile
index 34bd1d5f9672..73b3389da4d0 100644
index dfc7b0753e50..3bc8b562e6a7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -233,7 +231,7 @@ index 34bd1d5f9672..73b3389da4d0 100644
ifdef mixed-build
# ===========================================================================
# We're called with mixed targets (*config and build targets).
@@ -1242,7 +1265,13 @@ define filechk_version.h
@@ -1238,7 +1261,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@ -248,7 +246,7 @@ index 34bd1d5f9672..73b3389da4d0 100644
endef
$(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
@@ -1849,6 +1878,23 @@ endif
@@ -1846,6 +1875,23 @@ endif
ifdef CONFIG_MODULES
@ -504,49 +502,6 @@ index f1fea506e20f..d5bc9aaa1131 100644
unwind_init();
}
diff --git a/certs/extract-cert.c b/certs/extract-cert.c
index 70e9ec89d87d..f5fb74916cee 100644
--- a/certs/extract-cert.c
+++ b/certs/extract-cert.c
@@ -21,7 +21,6 @@
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <openssl/err.h>
-#include <openssl/engine.h>
/*
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
@@ -122,28 +121,8 @@ int main(int argc, char **argv)
fclose(f);
exit(0);
} else if (!strncmp(cert_src, "pkcs11:", 7)) {
- ENGINE *e;
- struct {
- const char *cert_id;
- X509 *cert;
- } parms;
-
- parms.cert_id = cert_src;
- parms.cert = NULL;
-
- ENGINE_load_builtin_engines();
- drain_openssl_errors();
- e = ENGINE_by_id("pkcs11");
- ERR(!e, "Load PKCS#11 ENGINE");
- if (ENGINE_init(e))
- drain_openssl_errors();
- else
- ERR(1, "ENGINE_init");
- if (key_pass)
- ERR(!ENGINE_ctrl_cmd_string(e, "PIN", key_pass, 0), "Set PKCS#11 PIN");
- ENGINE_ctrl_cmd(e, "LOAD_CERT_CTRL", 0, &parms, NULL, 1);
- ERR(!parms.cert, "Get X.509 from PKCS#11");
- write_cert(parms.cert);
+ fprintf(stderr, "Error: pkcs11 not implemented\n");
+ exit(1);
} else {
BIO *b;
X509 *x509;
diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index e0ff5f4dda6d..098a52ded759 100644
--- a/crypto/akcipher.c
@ -1873,7 +1828,7 @@ index 2168b6cd7167..5d7cda175a0c 100644
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index ed6c5cb60c5a..70cb770b78bb 100644
index 83c8e617a2c5..27f9b4517095 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@
@ -2665,7 +2620,7 @@ index be2e8c0a187e..114e213c89e2 100644
+
#endif
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
index 1d59513bf230..ab2777d2ed63 100644
index 9eca013aa5e1..6f25ce6867a2 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -438,6 +438,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
@ -3403,7 +3358,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h
index c37c32ebbdcd..b972f1273271 100644
index b86ec2afc691..3a794a730bb2 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -522,6 +522,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@ -3469,7 +3424,7 @@ index 4e07cc057d6f..56bc91fcd142 100644
long bpf_jit_limit_max __read_mostly;
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 8386f25bc532..5fe5f8cf0b53 100644
index a8f1808a1ca5..10467ce30418 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -26,6 +26,7 @@
@ -3504,7 +3459,7 @@ index 8386f25bc532..5fe5f8cf0b53 100644
int sysctl_unprivileged_bpf_disabled __read_mostly =
IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
@@ -6042,6 +6060,11 @@ static int bpf_unpriv_handler(const struct ctl_table *table, int write,
@@ -5959,6 +5977,11 @@ static int bpf_unpriv_handler(const struct ctl_table *table, int write,
if (write && !ret) {
if (locked_state && unpriv_enable != 1)
return -EPERM;
@ -4598,18 +4553,18 @@ index 000000000000..84e22b1730cc
+}
+late_initcall(__add_rh_flag);
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index d16d0ace2775..e0aab60d74c4 100644
index 107393a8c48a..5e413a017b9a 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -25,6 +25,7 @@
#include <list.h>
@@ -26,6 +26,7 @@
#include <xalloc.h>
#include "modpost.h"
#include "../../include/linux/license.h"
+#include "../../include/generated/uapi/linux/version.h"
static bool module_enabled;
/* Are we using CONFIG_MODVERSIONS? */
@@ -1931,6 +1932,12 @@ static void write_buf(struct buffer *b, const char *fname)
@@ -1915,6 +1916,12 @@ static void write_buf(struct buffer *b, const char *fname)
}
}
@ -4622,7 +4577,7 @@ index d16d0ace2775..e0aab60d74c4 100644
static void write_if_changed(struct buffer *b, const char *fname)
{
char *tmp;
@@ -1991,6 +1998,7 @@ static void write_mod_c_file(struct module *mod)
@@ -1975,6 +1982,7 @@ static void write_mod_c_file(struct module *mod)
add_depends(&buf, mod);
add_moddevtable(&buf, mod);
add_srcversion(&buf, mod);
@ -4630,60 +4585,6 @@ index d16d0ace2775..e0aab60d74c4 100644
ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
if (ret >= sizeof(fname)) {
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 3edb156ae52c..0114ae1dbf7f 100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -27,7 +27,6 @@
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/err.h>
-#include <openssl/engine.h>
/*
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
@@ -99,16 +98,6 @@ static void display_openssl_errors(int l)
}
}
-static void drain_openssl_errors(void)
-{
- const char *file;
- int line;
-
- if (ERR_peek_error() == 0)
- return;
- while (ERR_get_error_line(&file, &line)) {}
-}
-
#define ERR(cond, fmt, ...) \
do { \
bool __cond = (cond); \
@@ -144,22 +133,8 @@ static EVP_PKEY *read_private_key(const char *private_key_name)
EVP_PKEY *private_key;
if (!strncmp(private_key_name, "pkcs11:", 7)) {
- ENGINE *e;
-
- ENGINE_load_builtin_engines();
- drain_openssl_errors();
- e = ENGINE_by_id("pkcs11");
- ERR(!e, "Load PKCS#11 ENGINE");
- if (ENGINE_init(e))
- drain_openssl_errors();
- else
- ERR(1, "ENGINE_init");
- if (key_pass)
- ERR(!ENGINE_ctrl_cmd_string(e, "PIN", key_pass, 0),
- "Set PKCS#11 PIN");
- private_key = ENGINE_load_private_key(e, private_key_name,
- NULL, NULL);
- ERR(!private_key, "%s", private_key_name);
+ fprintf(stderr, "Error: pkcs11 not implemented\n");
+ exit(1);
} else {
BIO *b;
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 191e0461d6d5..e6f418b3e948 100755
--- a/scripts/tags.sh
@ -4758,7 +4659,7 @@ index f2bdbd55aa2b..ddf496f7fca5 100644
static const struct lsm_id lockdown_lsmid = {
diff --git a/security/security.c b/security/security.c
index 4564a0a1e4ef..1144ceef694a 100644
index 6875eb4a59fc..fa246e76d54d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -5767,6 +5767,18 @@ int security_locked_down(enum lockdown_reason what)

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.11-9959-gabf2050f51fd.tar.xz) = 99fb1c52a02582a3763c1337e86f16a8c4b9f9d49395a76595887f8e611f3115fec0454a30847bc3b9b568084593584dfb980afbf16ea94dd95ba11b1d461fc7
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 322769ec28f428b5eb328ce7b26614086cda72bacaa44b8009dbf86db9d1bd5c8ea4082b5ffef7a4d410b577920d48c4f75d7d8d294bf8bbd31d3a898f067a58
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 3e57e33b3ee2bd914b5b80bbeac59dfb198ced9f7b55b4aaba91c2216ae01207b8a49994eacbda914476915f7d3963eb292da42cb1fb79e752a57e4c77573807
SHA512 (linux-6.11-10547-g684a64bf32b6.tar.xz) = 8d7c61325db417027aed3ccea69ab2086d5e2535088a06bc3f8a2bf2b9b714b331e42df6c341ba14a560e6015fec443785e0a64ff83a77878bd50622305fa7c9
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 5375475921149c1c7bfcaec381cef243d1c18567e37651102a63597d15b68f429b123983f441be4bc544d6509d08c5eea89d1177c301701571bce19813c443c7
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 8565e90e06c40ea536df321f87c34d42c84cb2d600e6f163203cf477febae2166a1aad42fcc16725f61f92db4f2415e9fd399d4ec3bf6fad88304aa0dfd4484c