metalefty/fedora-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Activity

kernel-6.12.0-0.rc3.20241019git3d5ad2d4eca3.37

Browse Source 
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.37]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-10-19 09:55:30 -06:00
parent 4c790c1c9f
commit 0b41a21f27
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
6 changed files with 58 additions and 25 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 = 32 RHEL_RELEASE = 37
# #
# RHEL_REBASE_NUM # RHEL_REBASE_NUM

8
Patchlist.changelog
View File

@ -1,8 +1,8 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/85613a9191d12b6a228d744a05e1da679d63cf4f https://gitlab.com/cki-project/kernel-ark/-/commit/ac800eaab10cb4a12b5d0af771737988408a9fa3
85613a9191d12b6a228d744a05e1da679d63cf4f tools/rtla: fix collision with glibc sched_attr/sched_set_attr ac800eaab10cb4a12b5d0af771737988408a9fa3 tools/rtla: fix collision with glibc sched_attr/sched_set_attr
https://gitlab.com/cki-project/kernel-ark/-/commit/51f0274f2669b9c7823b84830443ce9003cbc52e https://gitlab.com/cki-project/kernel-ark/-/commit/3d4b2894460137ae3b130cfe438355eb72f483f6
51f0274f2669b9c7823b84830443ce9003cbc52e tools/rtla: drop __NR_sched_getattr 3d4b2894460137ae3b130cfe438355eb72f483f6 tools/rtla: drop __NR_sched_getattr
https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21 https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21
77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'" 77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'"

21
kernel.changelog
View File

@ -1,3 +1,24 @@
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.37]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek)
Resolves:
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36]
- Linux v6.12.0-0.rc3.3d5ad2d4eca3
Resolves:
* Fri Oct 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.4d939780b705.35]
- Linux v6.12.0-0.rc3.4d939780b705
Resolves:
* Thu Oct 17 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.c964ced77262.34]
- Linux v6.12.0-0.rc3.c964ced77262
Resolves:
* Wed Oct 16 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.2f87d0916ce0.33]
- Linux v6.12.0-0.rc3.2f87d0916ce0
Resolves:
* Tue Oct 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.eca631b8fe80.32] * Tue Oct 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.eca631b8fe80.32]
- redhat: configs: decrease CONFIG_PCP_BATCH_SCALE_MAX (Rafael Aquini) - redhat: configs: decrease CONFIG_PCP_BATCH_SCALE_MAX (Rafael Aquini)
- redhat/configs: Enable CONFIG_RCU_TRACE in Fedora/REHL kernels (Waiman Long) - redhat/configs: Enable CONFIG_RCU_TRACE in Fedora/REHL kernels (Waiman Long)

20
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0 %define specrpmversion 6.12.0
%define specversion 6.12.0 %define specversion 6.12.0
%define patchversion 6.12 %define patchversion 6.12
%define pkgrelease 0.rc3.20241015giteca631b8fe80.32 %define pkgrelease 0.rc3.20241019git3d5ad2d4eca3.37
%define kversion 6 %define kversion 6
%define tarfile_release 6.12-rc3-13-geca631b8fe80 %define tarfile_release 6.12-rc3-389-g3d5ad2d4eca3
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 12 %define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20241015giteca631b8fe80.32%{?buildid}%{?dist} %define specrelease 0.rc3.20241019git3d5ad2d4eca3.37%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.12.0 %define kabiversion 6.12.0
@ -4136,10 +4136,22 @@ fi\
# #
# #
%changelog %changelog
* Tue Oct 15 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.0-0.rc3.20241015giteca631b8fe80.32] * Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.37]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek)
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36]
- Linux v6.12.0-0.rc3.3d5ad2d4eca3
* Fri Oct 18 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.4d939780b705.35]
- Linux v6.12.0-0.rc3.4d939780b705
* Thu Oct 17 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.c964ced77262.34]
- Linux v6.12.0-0.rc3.c964ced77262
* Wed Oct 16 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.2f87d0916ce0.33]
- Linux v6.12.0-0.rc3.2f87d0916ce0
* Tue Oct 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.eca631b8fe80.32] * Tue Oct 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.eca631b8fe80.32]
- redhat: configs: decrease CONFIG_PCP_BATCH_SCALE_MAX (Rafael Aquini) - redhat: configs: decrease CONFIG_PCP_BATCH_SCALE_MAX (Rafael Aquini)
- redhat/configs: Enable CONFIG_RCU_TRACE in Fedora/REHL kernels (Waiman Long) - redhat/configs: Enable CONFIG_RCU_TRACE in Fedora/REHL kernels (Waiman Long)

26
patch-6.12-redhat.patch
View File

@ -349,10 +349,10 @@ index a3fea683b227..a3162d93f437 100644
/* boot_command_line has been already set up in early.c */ /* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line; *cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 07a34d723505..74034beda43b 100644 index f1040cb64841..52403adbe5eb 100644
--- a/arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c
@@ -1596,6 +1596,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -1599,6 +1599,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
get_cpu_vendor(c); get_cpu_vendor(c);
intel_unlock_cpuid_leafs(c); intel_unlock_cpuid_leafs(c);
get_cpu_cap(c); get_cpu_cap(c);
@ -873,10 +873,10 @@ index 17e11d51ddc3..9c136a3b6267 100644
inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx);
diff --git a/crypto/testmgr.c b/crypto/testmgr.c diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index ee8da628e9da..b7df0a6442b6 100644 index 2f5f6b52b2d4..51acb3cb64fb 100644
--- a/crypto/testmgr.c --- a/crypto/testmgr.c
+++ b/crypto/testmgr.c +++ b/crypto/testmgr.c
@@ -4235,7 +4235,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -4234,7 +4234,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
* Don't invoke (decrypt or sign) test which require a private key * Don't invoke (decrypt or sign) test which require a private key
* for vectors with only a public key. * for vectors with only a public key.
*/ */
@ -885,7 +885,7 @@ index ee8da628e9da..b7df0a6442b6 100644
err = 0; err = 0;
goto free_all; goto free_all;
} }
@@ -5114,14 +5114,12 @@ static const struct alg_test_desc alg_test_descs[] = { @@ -5113,14 +5113,12 @@ static const struct alg_test_desc alg_test_descs[] = {
}, { }, {
.alg = "ecdh-nist-p256", .alg = "ecdh-nist-p256",
.test = alg_test_kpp, .test = alg_test_kpp,
@ -1947,7 +1947,7 @@ index a00671b58701..eeef2766b8b3 100644
if (ret < 0) if (ret < 0)
goto err_allowedips; goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 43d73d31c66f..e0ff0b221f62 100644 index 84cb859a911d..a02f37cc8376 100644
--- a/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -263,6 +263,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -263,6 +263,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -2017,7 +2017,7 @@ index 43d73d31c66f..e0ff0b221f62 100644
#ifdef CONFIG_NVME_HOST_AUTH #ifdef CONFIG_NVME_HOST_AUTH
queue_work(nvme_wq, &ctrl->dhchap_auth_work); queue_work(nvme_wq, &ctrl->dhchap_auth_work);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 48e7a8906d01..e649b3d1e260 100644 index 6a15873055b9..59d389b13dac 100644
--- a/drivers/nvme/host/multipath.c --- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c
@@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@ -2053,7 +2053,7 @@ index 48e7a8906d01..e649b3d1e260 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags); spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) { for (bio = req->bio; bio; bio = bio->bi_next) {
@@ -1008,8 +1014,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) @@ -1034,8 +1040,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
int error = 0; int error = 0;
/* check if multipath is enabled and we have the capability */ /* check if multipath is enabled and we have the capability */
@ -2064,10 +2064,10 @@ index 48e7a8906d01..e649b3d1e260 100644
/* initialize this in the identify path to cover controller resets */ /* initialize this in the identify path to cover controller resets */
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 313a4f978a2c..53cbb5224f98 100644 index 093cb423f536..6a9fcd5b7f79 100644
--- a/drivers/nvme/host/nvme.h --- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h
@@ -946,6 +946,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -947,6 +947,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
void nvme_failover_req(struct request *req); void nvme_failover_req(struct request *req);
@ -2075,7 +2075,7 @@ index 313a4f978a2c..53cbb5224f98 100644
void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid);
@@ -988,6 +989,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) @@ -989,6 +990,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
static inline void nvme_failover_req(struct request *req) static inline void nvme_failover_req(struct request *req)
{ {
} }
@ -3426,7 +3426,7 @@ index 5e77c58e0601..4de8774458ac 100644
long bpf_jit_limit_max __read_mostly; long bpf_jit_limit_max __read_mostly;
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index a8f1808a1ca5..10467ce30418 100644 index 8cfa7183d2ef..713427537ea8 100644
--- a/kernel/bpf/syscall.c --- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -3461,7 +3461,7 @@ index a8f1808a1ca5..10467ce30418 100644
int sysctl_unprivileged_bpf_disabled __read_mostly = int sysctl_unprivileged_bpf_disabled __read_mostly =
IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
@@ -5959,6 +5977,11 @@ static int bpf_unpriv_handler(const struct ctl_table *table, int write, @@ -5974,6 +5992,11 @@ static int bpf_unpriv_handler(const struct ctl_table *table, int write,
if (write && !ret) { if (write && !ret) {
if (locked_state && unpriv_enable != 1) if (locked_state && unpriv_enable != 1)
return -EPERM; return -EPERM;

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.12-rc3-13-geca631b8fe80.tar.xz) = 53be1cf7187dcff0efeb398022f32f300c78eb94efdc63ca4838510a5e1d154df8168e0c19cbdcf80205d9240064597870a4a0ee9809b1b755167e6cedc28521 SHA512 (linux-6.12-rc3-389-g3d5ad2d4eca3.tar.xz) = 87f99a2bd55128af7e54a15d51029fa862d23682e8ce231a48ef54e7b37d38b806485aec18d2401d8b30bbf5c26d2efeabc4daa63c3bbde3515c23edfacce999
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 6d467bbe7d470d9c510a14dbc03d99e02b510b592834030fddd4e155f3d41317f1b0e0e2e2974294e2e1eaa70ca71f03efaac46dc54ed6706aad3ca84c8404f0 SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = d3b3dc1df9ead1d489242f20286ef7a23c01ee5b8c3da6f0f63e3678e3b57932de6d5333d5a798f0eee22ecb88e5e26b5a59b103d54c8dede7bd4a3e3333765d
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 66fb8ab9a4bcd6002b2e1076f24d9aff43d9f0297356eecde75105630eb232f6c86f44d00a9f719bc6a40b9c58451a842d70dd3a55248572edc16852c84e84a3 SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = e3b483d081ef33efbe4515e47ebdfbe9743b56f2de014972ede778e479bc7bc678dd6c41e6f663927ecfaf95d9b5251a8a5e324cd1faa54c5af164938a4b1d26