Skip to content

Commit b98742a

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into 2.0
2 parents f58442c + 0fe0c32 commit b98742a

26 files changed

Lines changed: 111 additions & 648 deletions

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

Lines changed: 7 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.167.1
12+
Version: 5.15.173.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Dec 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.173.1-1
157+
- Auto-upgrade to 5.15.173.1
158+
159+
* Thu Dec 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.169.1-1
160+
- Auto-upgrade to 5.15.169.1
161+
156162
* Wed Sep 18 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.167.1-1
157163
- Auto-upgrade to 5.15.167.1
158164

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

Lines changed: 7 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.167.1
7+
Version: 5.15.173.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Fri Dec 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.173.1-1
153+
- Auto-upgrade to 5.15.173.1
154+
155+
* Thu Dec 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.169.1-1
156+
- Auto-upgrade to 5.15.169.1
157+
152158
* Wed Sep 18 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.167.1-1
153159
- Auto-upgrade to 5.15.167.1
154160

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

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

155155
%changelog
156+
* Fri Dec 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.173.1-1
157+
- Auto-upgrade to 5.15.173.1
158+
159+
* Thu Dec 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.169.1-1
160+
- Auto-upgrade to 5.15.169.1
161+
156162
* Wed Oct 23 2024 Rachel Menge <rachelmenge@microsoft.com> - 5.15.167.1-2
157163
- Bump release to match kernel
158164

‎SPECS/hyperv-daemons/hyperv-daemons.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
88
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
99
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
10-
"kernel-5.15.167.1.tar.gz": "2f529a3abf4167d1de5f7dd73043827db2c08d647d924990843ee914b0558ee0"
10+
"kernel-5.15.173.1.tar.gz": "f1aeb91c86010db1138bdf7b45d06b886fc34e07e554bd3116fac2d6f5d42d54"
1111
}
1212
}

‎SPECS/hyperv-daemons/hyperv-daemons.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%global udev_prefix 70
99
Summary: Hyper-V daemons suite
1010
Name: hyperv-daemons
11-
Version: 5.15.167.1
11+
Version: 5.15.173.1
1212
Release: 1%{?dist}
1313
License: GPLv2+
1414
Vendor: Microsoft Corporation
@@ -219,6 +219,12 @@ fi
219219
%{_sbindir}/lsvmbus
220220

221221
%changelog
222+
* Fri Dec 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.173.1-1
223+
- Auto-upgrade to 5.15.173.1
224+
225+
* Thu Dec 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.169.1-1
226+
- Auto-upgrade to 5.15.169.1
227+
222228
* Wed Sep 18 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.167.1-1
223229
- Auto-upgrade to 5.15.167.1
224230

‎SPECS/kernel-azure/config‎

Lines changed: 4 additions & 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 5.15.167.1 Kernel Configuration
3+
# Linux/x86_64 5.15.173.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -6771,6 +6771,9 @@ CONFIG_TRUSTED_KEYS=m
67716771
CONFIG_ENCRYPTED_KEYS=m
67726772
# CONFIG_KEY_DH_OPERATIONS is not set
67736773
CONFIG_SECURITY_DMESG_RESTRICT=y
6774+
CONFIG_PROC_MEM_ALWAYS_FORCE=y
6775+
# CONFIG_PROC_MEM_FORCE_PTRACE is not set
6776+
# CONFIG_PROC_MEM_NO_FORCE is not set
67746777
CONFIG_SECURITY=y
67756778
CONFIG_SECURITYFS=y
67766779
CONFIG_SECURITY_NETWORK=y

‎SPECS/kernel-azure/config_aarch64‎

Lines changed: 4 additions & 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 5.15.167.1 Kernel Configuration
3+
# Linux/arm64 5.15.173.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -8934,6 +8934,9 @@ CONFIG_TRUSTED_KEYS=m
89348934
CONFIG_ENCRYPTED_KEYS=m
89358935
# CONFIG_KEY_DH_OPERATIONS is not set
89368936
CONFIG_SECURITY_DMESG_RESTRICT=y
8937+
CONFIG_PROC_MEM_ALWAYS_FORCE=y
8938+
# CONFIG_PROC_MEM_FORCE_PTRACE is not set
8939+
# CONFIG_PROC_MEM_NO_FORCE is not set
89378940
CONFIG_SECURITY=y
89388941
CONFIG_SECURITYFS=y
89398942
CONFIG_SECURITY_NETWORK=y

‎SPECS/kernel-azure/kernel-azure.signatures.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
4-
"config": "97d9d65905746afb5c23e03bc0d5c4c2703f1701ffb61031dda00e8541ecf185",
5-
"config_aarch64": "616ea3ccfdf311b10a2702e7eac052f561fb0556a94b0c5e1b72c6293fca5083",
4+
"config": "790ebe8deaae330c23bac52ed9c7c243a3863f0d298032fde88324f7911f430f",
5+
"config_aarch64": "91754e5716915767b1f8b7c08738a2f46bb7dbf97ae948711c26f13df86273e6",
66
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
7-
"kernel-5.15.167.1.tar.gz": "2f529a3abf4167d1de5f7dd73043827db2c08d647d924990843ee914b0558ee0"
7+
"kernel-5.15.173.1.tar.gz": "f1aeb91c86010db1138bdf7b45d06b886fc34e07e554bd3116fac2d6f5d42d54"
88
}
99
}

‎SPECS/kernel-azure/kernel-azure.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
Summary: Linux Kernel
2929
Name: kernel-azure
30-
Version: 5.15.167.1
30+
Version: 5.15.173.1
3131
Release: 1%{?dist}
3232
License: GPLv2
3333
Vendor: Microsoft Corporation
@@ -420,6 +420,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
420420
%{_sysconfdir}/bash_completion.d/bpftool
421421

422422
%changelog
423+
* Fri Dec 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.173.1-1
424+
- Auto-upgrade to 5.15.173.1
425+
426+
* Thu Dec 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.169.1-1
427+
- Auto-upgrade to 5.15.169.1
428+
423429
* Wed Sep 18 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.167.1-1
424430
- Auto-upgrade to 5.15.167.1
425431

0 commit comments

Comments
 (0)