Merge remote-tracking branch 'up/f41' into f41-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-11-23 11:13:29 +02:00
commit 544a0b6c96
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
4 changed files with 19 additions and 10 deletions

View File

@ -1,3 +1,8 @@
* Fri Nov 22 2024 Augusto Caringi <acaringi@redhat.com> [6.11.10-0]
- Remove F39 from release_targets as we near EOL (Justin M. Forbes)
- Linux v6.11.10
Resolves:
* Sun Nov 17 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.11.9-0] * Sun Nov 17 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.11.9-0]
- Linux v6.11.9 - Linux v6.11.9
Resolves: Resolves:

View File

@ -160,18 +160,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 1 %define debugbuildsenabled 1
# define buildid .local # define buildid .local
%define specrpmversion 6.11.9 %define specrpmversion 6.11.10
%define specversion 6.11.9 %define specversion 6.11.10
%define patchversion 6.11 %define patchversion 6.11
%define pkgrelease 300 %define pkgrelease 300
%define kversion 6 %define kversion 6
%define tarfile_release 6.11.9 %define tarfile_release 6.11.10
# 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 300%{?buildid}.0.riscv64%{?dist} %define specrelease 300%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.11.9 %define kabiversion 6.11.10
# If this variable is set to 1, a bpf selftests build failure will cause a # If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error # fatal kernel package build error
@ -4128,9 +4128,13 @@ fi\
# #
# #
%changelog %changelog
* Thu Nov 21 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.9-0.0.riscv64] * Sat Nov 23 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.10-0.0.riscv64]
- Update for riscv64 - Update for riscv64
* Fri Nov 22 2024 Augusto Caringi <acaringi@redhat.com> [6.11.10-0]
- Remove F39 from release_targets as we near EOL (Justin M. Forbes)
- Linux v6.11.10
* Sun Nov 17 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.11.9-0] * Sun Nov 17 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.11.9-0]
- Linux v6.11.9 - Linux v6.11.9

View File

@ -46,7 +46,7 @@
45 files changed, 971 insertions(+), 233 deletions(-) 45 files changed, 971 insertions(+), 233 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3e48c8d84540..973bfa6438ed 100644 index 4b075e003b2d..6bcdec719505 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -124,7 +124,7 @@ index 84c08b46519d..c281697142b1 100644
reg = <0x40000000 0x100>; reg = <0x40000000 0x100>;
interrupt-controller; interrupt-controller;
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 402ae0297993..bdfabc559adc 100644 index 7d92c0a9c43d..61d12d7981b2 100644
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1366,7 +1366,7 @@ endchoice @@ -1366,7 +1366,7 @@ endchoice

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.11.9.tar.xz) = e5400b7f755fa7ce213b1b395a5a548014da524c4d31188d44181ac7fe0db178d2d5bb0d8a34d84e44712f20053428ec163f80d880a32dbab82f8592b3b257e7 SHA512 (linux-6.11.10.tar.xz) = b09e87e8ee5c24b5cf1347cd7020c91b8ed6907cb8e6cc9c2f94590fb0a9a446a3d360f9289b9d6e1653a06add14309d6a62b44c4e96057dbceb151a8525c6cb
SHA512 (kernel-abi-stablelists-6.11.9.tar.xz) = ac8826b21224b128bd96d04c49adaa751f0bb5b3b17fad0bb8e2285c75a91634019974ab45c5f48af3e5fcb0918e3b5e1f10b76b026a55711f1381ad1183eee9 SHA512 (kernel-abi-stablelists-6.11.10.tar.xz) = 4bde6be8304c98ac0c616a7fcd10e5f94641d94cdf89f1f6a77924374d7c960eb156b595dc3c8bf8c7cef30ffeef331110d03f0f92bde602c1aa772f7ee346bc
SHA512 (kernel-kabi-dw-6.11.9.tar.xz) = 4675f6e36cbd701ea77d3ec51e79279f10b75d24bf8a4da751064e52cd0e5c269f112478e5c432caf30f9f9fdc8ac13e826ae8011cf61e82626d552d7b783caa SHA512 (kernel-kabi-dw-6.11.10.tar.xz) = 1cdce3c515d38395fdae3d92e4749b270ee1a195a1dd803a4b7091fe19fdd6b8237c0e2f38ab90ed53a3c646bfcba6d470658ac2138bc5d668e7e2a4d8c95c5d