Skip to content

Commit 1cf548b

Browse files
committed
Merge remote-tracking branch 'upstream/f41' into 6.11-bazzite
2 parents cd6eac1 + 957447b commit 1cf548b

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

kernel.changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Fri Nov 01 2024 Augusto Caringi <[email protected]> [6.11.6-0]
2+
- Linux v6.11.6
3+
Resolves:
4+
15
* Tue Oct 22 2024 Augusto Caringi <[email protected]> [6.11.5-0]
26
- Revert "fedora/configs: enable GPIO expander drivers" (Justin M. Forbes)
37
- Add bluetooth bzs to BugsFixed (Justin M. Forbes)

kernel.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,18 +161,18 @@ Summary: The Linux kernel
161161
%define debugbuildsenabled 1
162162
%define buildid .bazzite
163163
# define buildid .local
164-
%define specrpmversion 6.11.5
165-
%define specversion 6.11.5
164+
%define specrpmversion 6.11.6
165+
%define specversion 6.11.6
166166
%define patchversion 6.11
167167
%define pkgrelease 300
168168
%define kversion 6
169-
%define tarfile_release 6.11.5
169+
%define tarfile_release 6.11.6
170170
# This is needed to do merge window version magic
171171
%define patchlevel 11
172172
# This allows pkg_release to have configurable %%{?dist} tag
173173
%define specrelease 310%{?buildid}%{?dist}
174174
# This defines the kabi tarball version
175-
%define kabiversion 6.11.5
175+
%define kabiversion 6.11.6
176176

177177
# If this variable is set to 1, a bpf selftests build failure will cause a
178178
# fatal kernel package build error
@@ -4120,6 +4120,9 @@ fi\
41204120
#
41214121
#
41224122
%changelog
4123+
* Fri Nov 01 2024 Augusto Caringi <[email protected]> [6.11.6-0]
4124+
- Linux v6.11.6
4125+
41234126
* Tue Oct 22 2024 Augusto Caringi <[email protected]> [6.11.5-0]
41244127
- Revert "fedora/configs: enable GPIO expander drivers" (Justin M. Forbes)
41254128
- Add bluetooth bzs to BugsFixed (Justin M. Forbes)

patch-6.11-redhat.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
47 files changed, 1020 insertions(+), 240 deletions(-)
4949

5050
diff --git a/Makefile b/Makefile
51-
index 687ce7aee67a7..47e5d15bc9d22 100644
51+
index 318a5d60088e0..11471699fb194 100644
5252
--- a/Makefile
5353
+++ b/Makefile
5454
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

sources

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SHA512 (linux-6.11.5.tar.xz) = 7439e2711d487c2951256ecd14c0023f1a9347f5d526b54ef79e574e8753fe5473338a0c65d95b84a51d2ab3a52611d2fd7c34cd8e47e36a9037b1d1ace5e3b7
2-
SHA512 (kernel-abi-stablelists-6.11.5.tar.xz) = ba3305f11f47add2704b4c80f47a3d457bbe43f855cef48d8a6fb40f3f14db48572d3b7ef9e67b39730acb8c9fb402c1502fbca63076f44b4eee138cd6158f0a
3-
SHA512 (kernel-kabi-dw-6.11.5.tar.xz) = c3dd533a5875451784838482b6dfa073731a01c77b8e1072b436bc21d309588ebc2618ab762f13c1c92f275e1a742745134791378713a540e9cb7964ee7c5bc3
1+
SHA512 (linux-6.11.6.tar.xz) = e882861b01e3808879d42fc6b3190fbcf27b5eba438a77b71a2f29de31af2fe9f048c50cbfc6c7fb92a717fe55f91cf3af951ffebc9af7d36b1e5ac42b8ec0b3
2+
SHA512 (kernel-abi-stablelists-6.11.6.tar.xz) = c36397ab093af834160327860b8a3140ae08d5f0d1d3d0a29c576a561200fc7984563d216acad4efc9cc757fc6984d41476bc60b0f2ba8a4a2a4d8d9ed8579d1
3+
SHA512 (kernel-kabi-dw-6.11.6.tar.xz) = de8f531db663d6c1dee2f1924b7f08872f65f133a893b964d5bc59269381ad77957af8cd3d2a06c59935128a49bdd4a74c987a63b32acba8acaf96fcbbb925c7

0 commit comments

Comments
 (0)