Skip to content

Commit a313d25

Browse files
committed
Merge branch 'main' into 2.0
2 parents bd7df6f + 9f6da3e commit a313d25

File tree

133 files changed

+10325
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+10325
-259
lines changed

.pipelines/fasttrack/FasttrackMergeNotifier.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ extends:
1515
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
1616
parameters:
1717
featureFlags:
18+
use1esentry: false # this disables 1es entrypoint which is a workaround for issues from IcM https://portal.microsofticm.com/imp/v5/incidents/details/743308145/summary
1819
LinuxHostVersion:
1920
Network: R1
2021
runOnHost: true

.pipelines/prchecks/PackageBuildPRCheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ extends:
4848
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
4949
parameters:
5050
featureFlags:
51+
use1esentry: false # this disables 1es entrypoint which is a workaround for issues from IcM https://portal.microsofticm.com/imp/v5/incidents/details/743308145/summary
5152
LinuxHostVersion:
5253
Network: R1
5354
globalSdl:

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.200.1
12+
Version: 5.15.202.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.202.1-1
157+
- Auto-upgrade to 5.15.202.1
158+
156159
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
157160
- Auto-upgrade to 5.15.200.1
158161

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.200.1
7+
Version: 5.15.202.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.202.1-1
153+
- Auto-upgrade to 5.15.202.1
154+
152155
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
153156
- Auto-upgrade to 5.15.200.1
154157

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.200.1
12+
Version: 5.15.202.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.202.1-1
157+
- Auto-upgrade to 5.15.202.1
158+
156159
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
157160
- Auto-upgrade to 5.15.200.1
158161

0 commit comments

Comments
 (0)