Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions SPECS/kernel-mshv/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.6.121.mshv1 Kernel Configuration
# Linux/x86_64 6.6.135.mshv2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -7159,7 +7159,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
# CONFIG_NMI_CHECK_CPU is not set
# CONFIG_DEBUG_IRQFLAGS is not set
CONFIG_STACKTRACE=y
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
# CONFIG_DEBUG_KOBJECT is not set

#
Expand Down
4 changes: 2 additions & 2 deletions SPECS/kernel-mshv/config_aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.6.121.mshv1 Kernel Configuration
# Linux/arm64 6.6.135.mshv2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -5555,6 +5555,7 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_CS42L43_I2C is not set
# CONFIG_MFD_MADERA is not set
# CONFIG_MFD_MAX5970 is not set
# CONFIG_MFD_TN48M_CPLD is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9052_I2C is not set
Expand Down Expand Up @@ -10983,7 +10984,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y

# CONFIG_DEBUG_IRQFLAGS is not set
CONFIG_STACKTRACE=y
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
# CONFIG_DEBUG_KOBJECT is not set

#
Expand Down
6 changes: 3 additions & 3 deletions SPECS/kernel-mshv/kernel-mshv.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"50_mariner_mshv.cfg": "12bf23f8857f893549933a20062ad2a69c3c654b87893e8dd3ce42f9329801c7",
"50_mariner_mshv_menuentry": "5a46bb273be0e829fec4e1f498b1a11b59ded6e14d42a19be7da860c3f4c35be",
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "3513c71fb5d5dbc9c46e5fbca5767a0201fc3def43b8ee5e4fd754462e9591ae",
"kernel-mshv-6.6.121.mshv1.tar.gz": "a47c2bdfece34fa0ec7c6e81af5d2ef19ff4e0e97e79ab9d6e14a4b2e764346c",
"config_aarch64": "79b8844848674bcd16b4b0ac86b04ef8c9f6dbfdce3c56c11354e46f3f809da5"
"config": "f9878001e74a04551ae3d4b5ebcc9bfc6f154eaad592adeb39aba3c99240c153",
"kernel-mshv-6.6.135.mshv2.tar.gz": "7129F5EE0BE3354F0F6520778ECF5CA9A1DF11DF55567B28D139792B72C3BC45",
"config_aarch64": "1cfdac79f8d7aedaa307f6ceca53c14cdb7987a9d245fe392f5c4f598c1c3cd2"
}
}
8 changes: 6 additions & 2 deletions SPECS/kernel-mshv/kernel-mshv.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

Summary: Mariner kernel that has MSHV Host support
Name: kernel-mshv
Version: 6.6.121.mshv1
Release: 2%{?dist}
Version: 6.6.135.mshv2
Release: 1%{?dist}
License: GPLv2
Group: Development/Tools
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -267,6 +267,10 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_includedir}/perf/perf_dlfilter.h

%changelog

* Fri Apr 24 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.135.mshv2-1
- Upgrade to 6.6.135.mshv2

* Mon Mar 30 2026 Cameron Baird <cameronbaird@microsoft.com> - 6.6.121.mshv1-2
- Enable CONFIG_WIREGUARD in kernel config

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8391,8 +8391,8 @@
"type": "other",
"other": {
"name": "kernel-mshv",
"version": "6.6.121.mshv1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/kata/6.6.121.mshv1.tar.gz"
"version": "6.6.135.mshv2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/kata/6.6.135.mshv2.tar.gz"
}
}
},
Expand Down
Loading