kernel-6.12.0-0.rc5.20241031git0fc810ae3ae1.47
* Thu Oct 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.0fc810ae3ae1.47] - 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:
parent
0b81670a7b
commit
bebfe8f18e
@ -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 = 46
|
RHEL_RELEASE = 47
|
||||||
|
|
||||||
#
|
#
|
||||||
# RHEL_REBASE_NUM
|
# RHEL_REBASE_NUM
|
||||||
|
|||||||
@ -1,8 +1,11 @@
|
|||||||
https://gitlab.com/cki-project/kernel-ark/-/commit/6934893f9713e5770ba3d101d2d20b0a8011a6e7
|
https://gitlab.com/cki-project/kernel-ark/-/commit/196be8e5e1ea07defefc3de7415fb3823ac7b04a
|
||||||
6934893f9713e5770ba3d101d2d20b0a8011a6e7 tools/rtla: fix collision with glibc sched_attr/sched_set_attr
|
196be8e5e1ea07defefc3de7415fb3823ac7b04a tools/rtla: fix collision with glibc sched_attr/sched_set_attr
|
||||||
|
|
||||||
https://gitlab.com/cki-project/kernel-ark/-/commit/91fea6c5a1b62ec74e962e6eb9a1b51abece6c79
|
https://gitlab.com/cki-project/kernel-ark/-/commit/8451b49eb5c113f122847b8d0463326b0eb9d031
|
||||||
91fea6c5a1b62ec74e962e6eb9a1b51abece6c79 tools/rtla: drop __NR_sched_getattr
|
8451b49eb5c113f122847b8d0463326b0eb9d031 tools/rtla: drop __NR_sched_getattr
|
||||||
|
|
||||||
|
https://gitlab.com/cki-project/kernel-ark/-/commit/0756902dd6b52af5d02b221e5ea50565d31a50e7
|
||||||
|
0756902dd6b52af5d02b221e5ea50565d31a50e7 Update the RHEL_DIFFERENCES help string
|
||||||
|
|
||||||
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'"
|
||||||
|
|||||||
10407
kernel-aarch64-rt-debug-fedora.config
Normal file
10407
kernel-aarch64-rt-debug-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
10378
kernel-aarch64-rt-fedora.config
Normal file
10378
kernel-aarch64-rt-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
8711
kernel-riscv64-rt-debug-fedora.config
Normal file
8711
kernel-riscv64-rt-debug-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
8681
kernel-riscv64-rt-fedora.config
Normal file
8681
kernel-riscv64-rt-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
9245
kernel-x86_64-rt-debug-fedora.config
Normal file
9245
kernel-x86_64-rt-debug-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
9216
kernel-x86_64-rt-fedora.config
Normal file
9216
kernel-x86_64-rt-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,14 @@
|
|||||||
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.46]
|
* Thu Oct 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.0fc810ae3ae1.47]
|
||||||
- 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)
|
||||||
Resolves:
|
Resolves:
|
||||||
|
|
||||||
|
* Thu Oct 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.0fc810ae3ae1.46]
|
||||||
|
- Update the RHEL_DIFFERENCES help string (Don Zickus)
|
||||||
|
- Put build framework for RT kernel in place for Fedora (Clark Williams)
|
||||||
|
- Linux v6.12.0-0.rc5.0fc810ae3ae1
|
||||||
|
Resolves:
|
||||||
|
|
||||||
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.45]
|
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.45]
|
||||||
- Linux v6.12.0-0.rc5.c1e939a21eb1
|
- Linux v6.12.0-0.rc5.c1e939a21eb1
|
||||||
Resolves:
|
Resolves:
|
||||||
|
|||||||
29
kernel.spec
29
kernel.spec
@ -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.rc5.20241030gitc1e939a21eb1.46
|
%define pkgrelease 0.rc5.20241031git0fc810ae3ae1.47
|
||||||
%define kversion 6
|
%define kversion 6
|
||||||
%define tarfile_release 6.12-rc5-44-gc1e939a21eb1
|
%define tarfile_release 6.12-rc5-63-g0fc810ae3ae1
|
||||||
# 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.rc5.20241030gitc1e939a21eb1.46%{?buildid}%{?dist}
|
%define specrelease 0.rc5.20241031git0fc810ae3ae1.47%{?buildid}%{?dist}
|
||||||
# This defines the kabi tarball version
|
# This defines the kabi tarball version
|
||||||
%define kabiversion 6.12.0
|
%define kabiversion 6.12.0
|
||||||
|
|
||||||
@ -301,9 +301,8 @@ Summary: The Linux kernel
|
|||||||
%define with_ipaclones 0
|
%define with_ipaclones 0
|
||||||
# no stablelist
|
# no stablelist
|
||||||
%define with_kernel_abi_stablelists 0
|
%define with_kernel_abi_stablelists 0
|
||||||
# No realtime fedora variants
|
|
||||||
%define with_realtime 0
|
|
||||||
%define with_arm64_64k 0
|
%define with_arm64_64k 0
|
||||||
|
%define with_realtime 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_verbose}
|
%if %{with_verbose}
|
||||||
@ -987,13 +986,22 @@ Source214: Module.kabi_dup_riscv64
|
|||||||
Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
|
Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
|
||||||
Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
|
Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
|
||||||
|
|
||||||
%if %{include_rt}
|
%if 0%{include_rt}
|
||||||
# realtime config files
|
%if 0%{include_rhel}
|
||||||
Source474: %{name}-aarch64-rt-rhel.config
|
Source474: %{name}-aarch64-rt-rhel.config
|
||||||
Source475: %{name}-aarch64-rt-debug-rhel.config
|
Source475: %{name}-aarch64-rt-debug-rhel.config
|
||||||
Source476: %{name}-x86_64-rt-rhel.config
|
Source476: %{name}-x86_64-rt-rhel.config
|
||||||
Source477: %{name}-x86_64-rt-debug-rhel.config
|
Source477: %{name}-x86_64-rt-debug-rhel.config
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{include_fedora}
|
||||||
|
Source478: %{name}-aarch64-rt-fedora.config
|
||||||
|
Source479: %{name}-aarch64-rt-debug-fedora.config
|
||||||
|
Source480: %{name}-x86_64-rt-fedora.config
|
||||||
|
Source481: %{name}-x86_64-rt-debug-fedora.config
|
||||||
|
Source482: %{name}-riscv64-rt-fedora.config
|
||||||
|
Source483: %{name}-riscv64-rt-debug-fedora.config
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
# Sources for kernel-tools
|
# Sources for kernel-tools
|
||||||
Source2002: kvm_stat.logrotate
|
Source2002: kvm_stat.logrotate
|
||||||
@ -4136,10 +4144,15 @@ fi\
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.46]
|
* Thu Oct 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.0fc810ae3ae1.47]
|
||||||
- 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)
|
||||||
|
|
||||||
|
* Thu Oct 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.0fc810ae3ae1.46]
|
||||||
|
- Update the RHEL_DIFFERENCES help string (Don Zickus)
|
||||||
|
- Put build framework for RT kernel in place for Fedora (Clark Williams)
|
||||||
|
- Linux v6.12.0-0.rc5.0fc810ae3ae1
|
||||||
|
|
||||||
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.45]
|
* Wed Oct 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc5.c1e939a21eb1.45]
|
||||||
- Linux v6.12.0-0.rc5.c1e939a21eb1
|
- Linux v6.12.0-0.rc5.c1e939a21eb1
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
Documentation/admin-guide/kernel-parameters.txt | 20 +
|
Documentation/admin-guide/kernel-parameters.txt | 20 +
|
||||||
Documentation/admin-guide/rh-waived-features.rst | 21 +
|
Documentation/admin-guide/rh-waived-features.rst | 21 +
|
||||||
Kconfig | 2 +
|
Kconfig | 2 +
|
||||||
Kconfig.redhat | 26 +
|
Kconfig.redhat | 23 +
|
||||||
Makefile | 48 +-
|
Makefile | 48 +-
|
||||||
arch/arm/Kconfig | 4 +-
|
arch/arm/Kconfig | 4 +-
|
||||||
arch/arm64/Kconfig | 2 +-
|
arch/arm64/Kconfig | 2 +-
|
||||||
@ -83,7 +83,7 @@
|
|||||||
security/security.c | 12 +
|
security/security.c | 12 +
|
||||||
tools/tracing/rtla/src/utils.c | 36 +-
|
tools/tracing/rtla/src/utils.c | 36 +-
|
||||||
tools/tracing/rtla/src/utils.h | 2 +
|
tools/tracing/rtla/src/utils.h | 2 +
|
||||||
85 files changed, 2776 insertions(+), 236 deletions(-)
|
85 files changed, 2773 insertions(+), 236 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 1518343bbe22..c720321317ea 100644
|
index 1518343bbe22..c720321317ea 100644
|
||||||
@ -162,10 +162,10 @@ index 745bc773f567..f57ff40109d7 100644
|
|||||||
+source "Kconfig.redhat"
|
+source "Kconfig.redhat"
|
||||||
diff --git a/Kconfig.redhat b/Kconfig.redhat
|
diff --git a/Kconfig.redhat b/Kconfig.redhat
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..7465c78a90e6
|
index 000000000000..fd77bd5c97e2
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/Kconfig.redhat
|
+++ b/Kconfig.redhat
|
||||||
@@ -0,0 +1,26 @@
|
@@ -0,0 +1,23 @@
|
||||||
+# SPDX-License-Identifier: GPL-2.0-only
|
+# SPDX-License-Identifier: GPL-2.0-only
|
||||||
+#
|
+#
|
||||||
+# Red Hat specific options
|
+# Red Hat specific options
|
||||||
@ -174,13 +174,10 @@ index 000000000000..7465c78a90e6
|
|||||||
+menu "Red Hat options"
|
+menu "Red Hat options"
|
||||||
+
|
+
|
||||||
+config RHEL_DIFFERENCES
|
+config RHEL_DIFFERENCES
|
||||||
+ bool "Remove support for deprecated features"
|
+ bool "Enable RHEL-only code"
|
||||||
+ help
|
+ help
|
||||||
+ Red Hat may choose to deprecate certain features in its kernels.
|
+ This option controls whether rhel-only changes are enabled during
|
||||||
+ Enable this option to remove support for hardware that is no
|
+ the build. Unless you want to enable rhel-only changes, say N here.
|
||||||
+ longer supported.
|
|
||||||
+
|
|
||||||
+ Unless you want a restricted kernel, say N here.
|
|
||||||
+
|
+
|
||||||
+config RH_KABI_SIZE_ALIGN_CHECKS
|
+config RH_KABI_SIZE_ALIGN_CHECKS
|
||||||
+ bool "Enables more stringent kabi checks in the macros"
|
+ bool "Enables more stringent kabi checks in the macros"
|
||||||
|
|||||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-6.12-rc5-44-gc1e939a21eb1.tar.xz) = 671d3b857ac10e7280abf4088a2cd0ed477f2829b2e9eafe198fc4fb253e12f508925fc624cf20342898e4c4a3efdb0fa8af6a49e3c9f8383e9f612983375486
|
SHA512 (linux-6.12-rc5-63-g0fc810ae3ae1.tar.xz) = 5bb791b321f4d1d072508acf2ba6eb3239fe670bc1cebbc933087680b1eba517a07064bfdf0e27f3765c39a6f64d05317c36eeaf125aa5d79a8613b96d6361a4
|
||||||
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = f952f77d0103ccaefb325665bd9c9ce0642bcea9199976419ca0633d57723b6b209f83f3d754a9efbc14ac924c18828fcc55fb8f38368a3c6dd2483db11a4e64
|
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = c00d817be716f979a1d43a5d9e58b8cd23f97a97d52eb3332035fedcab6dd2f48cf798d5b0675a0e941bbb1577ac052bdfa4435656b2d7ebf507e1ef5cce1147
|
||||||
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = d357b5580c9889055319b4a94e9cd31e232b06cedc158a82ad9a4968418a6328d6f649c7bf451c4b270a0c856c6473cc71cd0dec216ec76a8c18f9e661638c9f
|
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = ba1a706f79d9fbdaa488ab6abff71bac1e4ed943b22d5b501d1898ae618d8b8912618bf2bac351f6cfb70e48e0564996cf7c1e8336495533c690f4ea7947399f
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user