Skip to content

Commit 433369a

Browse files
Merge PR "[AUTO-CHERRYPICK] kernel-mshv: upgrade to 6.6.137.mshv2 - branch 3.0-dev" microsoft#17663
Signed-off-by: Saul Paredes <saulparedes@microsoft.com> Co-authored-by: Saul Paredes <30801614+Redent0r@users.noreply.github.com>
1 parent 0afccfc commit 433369a

6 files changed

Lines changed: 17 additions & 11 deletions

File tree

SPECS-SIGNED/kernel-mshv-signed/kernel-mshv-signed.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
1111
Name: kernel-mshv-signed-%{buildarch}
12-
Version: 6.6.137.mshv1
13-
Release: 2%{?dist}
12+
Version: 6.6.137.mshv2
13+
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -140,6 +140,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
140140
%exclude /lib/modules/%{uname_r}/build
141141

142142
%changelog
143+
* Mon Jun 08 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv2-1
144+
- Upgrade to 6.6.137.mshv2
145+
143146
* Wed May 13 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv1-2
144147
- Enable missing configs per customer request
145148

SPECS/kernel-mshv/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.6.137.mshv1 Kernel Configuration
3+
# Linux/x86_64 6.6.137.mshv2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y

SPECS/kernel-mshv/config_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.6.137.mshv1 Kernel Configuration
3+
# Linux/arm64 6.6.137.mshv2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y

SPECS/kernel-mshv/kernel-mshv.signatures.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"50_mariner_mshv.cfg": "12bf23f8857f893549933a20062ad2a69c3c654b87893e8dd3ce42f9329801c7",
44
"50_mariner_mshv_menuentry": "5a46bb273be0e829fec4e1f498b1a11b59ded6e14d42a19be7da860c3f4c35be",
55
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
6-
"config": "5824f12c2fe2d5337414168640a9db0a2527c8cd4b3766b6074bf37028787c82",
7-
"kernel-mshv-6.6.137.mshv1.tar.gz": "1d4dbcf9768471fff5934899d8008a1260f225dc910e6dfd3e73f7d420b54b4a",
8-
"config_aarch64": "1377d8363a90820291c8146e3ad4df52ca7c676e28f1e2719a81a2b06178c269"
6+
"config": "06bfebf2dd96dc5d33c322c6d6819d10193500a253a6103fc779330dcffe8778",
7+
"kernel-mshv-6.6.137.mshv2.tar.gz": "30D61DCDEB145FD3B8BF7998D7E5C781B0FD9F5A15C803012C9172EF34416EF5",
8+
"config_aarch64": "8fda5822cf6c5265d238110917ad7b065417aac6b107b63e70f99c1deacb75a5"
99
}
1010
}

SPECS/kernel-mshv/kernel-mshv.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
Summary: Mariner kernel that has MSHV Host support
1919
Name: kernel-mshv
20-
Version: 6.6.137.mshv1
21-
Release: 2%{?dist}
20+
Version: 6.6.137.mshv2
21+
Release: 1%{?dist}
2222
License: GPLv2
2323
Group: Development/Tools
2424
Vendor: Microsoft Corporation
@@ -267,6 +267,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
267267
%{_includedir}/perf/perf_dlfilter.h
268268

269269
%changelog
270+
* Mon Jun 08 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv2-1
271+
- Upgrade to 6.6.137.mshv2
272+
270273
* Wed May 13 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv1-2
271274
- Enable missing configs per customer request
272275

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8411,8 +8411,8 @@
84118411
"type": "other",
84128412
"other": {
84138413
"name": "kernel-mshv",
8414-
"version": "6.6.137.mshv1",
8415-
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/kata/6.6.137.mshv1.tar.gz"
8414+
"version": "6.6.137.mshv2",
8415+
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/kata/6.6.137.mshv2.tar.gz"
84168416
}
84178417
}
84188418
},

0 commit comments

Comments
 (0)