Skip to content

Commit ee40780

Browse files
[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.158.1 - branch main (#9076)
Co-authored-by: Rachel Menge <rachelmenge@microsoft.com>
1 parent e1498b3 commit ee40780

23 files changed

Lines changed: 70 additions & 41 deletions

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.157.1
12+
Version: 5.15.158.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 May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
157+
- Auto-upgrade to 5.15.158.1
158+
156159
* Tue Apr 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.1-1
157160
- Auto-upgrade to 5.15.157.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.157.1
7+
Version: 5.15.158.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 May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
153+
- Auto-upgrade to 5.15.158.1
154+
152155
* Tue Apr 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.1-1
153156
- Auto-upgrade to 5.15.157.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.157.1
12+
Version: 5.15.158.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 May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
157+
- Auto-upgrade to 5.15.158.1
158+
156159
* Tue Apr 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.1-1
157160
- Auto-upgrade to 5.15.157.1
158161

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.157.1.tar.gz": "0857d0e26e6be1f5c76db041c6cc04ba959a9aba30d2a49b8171496ac3e0e3a6"
10+
"kernel-5.15.158.1.tar.gz": "e0620c81b0e04721afc8213b596ea76d14b3270e902012bc602e3d55934360b5"
1111
}
1212
}

SPECS/hyperv-daemons/hyperv-daemons.spec

Lines changed: 4 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.157.1
11+
Version: 5.15.158.1
1212
Release: 1%{?dist}
1313
License: GPLv2+
1414
Vendor: Microsoft Corporation
@@ -219,6 +219,9 @@ fi
219219
%{_sbindir}/lsvmbus
220220

221221
%changelog
222+
* Fri May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
223+
- Auto-upgrade to 5.15.158.1
224+
222225
* Tue Apr 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.1-1
223226
- Auto-upgrade to 5.15.157.1
224227

SPECS/kernel-azure/config

Lines changed: 3 additions & 2 deletions
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.157.1 Kernel Configuration
3+
# Linux/x86_64 5.15.158.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -501,7 +501,7 @@ CONFIG_LIVEPATCH=y
501501
# end of Processor type and features
502502

503503
CONFIG_CC_HAS_RETURN_THUNK=y
504-
CONFIG_SPECULATION_MITIGATIONS=y
504+
CONFIG_CPU_MITIGATIONS=y
505505
CONFIG_PAGE_TABLE_ISOLATION=y
506506
CONFIG_RETPOLINE=y
507507
CONFIG_RETHUNK=y
@@ -697,6 +697,7 @@ CONFIG_AS_AVX512=y
697697
CONFIG_AS_SHA1_NI=y
698698
CONFIG_AS_SHA256_NI=y
699699
CONFIG_AS_TPAUSE=y
700+
CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
700701

701702
#
702703
# General architecture-dependent options

SPECS/kernel-azure/config_aarch64

Lines changed: 2 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.157.1 Kernel Configuration
3+
# Linux/arm64 5.15.158.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -702,6 +702,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m
702702
# CONFIG_CRYPTO_POLY1305_NEON is not set
703703
CONFIG_CRYPTO_NHPOLY1305_NEON=m
704704
CONFIG_CRYPTO_AES_ARM64_BS=m
705+
CONFIG_CPU_MITIGATIONS=y
705706

706707
#
707708
# General architecture-dependent options
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": "172215fdca3319e25d7ca5b6a6b0b2b7779538c88c0d3ae7c5a85e29f09ee59c",
5-
"config_aarch64": "762864f091efe8388a926289f57949208f118f8279adc86755805e201330ab7d",
4+
"config": "30028d043a482088df75ef6a96a133e40fec8688cada0f9ec500859a64d29d1a",
5+
"config_aarch64": "cbab8c30dee0480e67d0a61282b9eafb9e5aadb08e468074f454e8d0644ec801",
66
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
7-
"kernel-5.15.157.1.tar.gz": "0857d0e26e6be1f5c76db041c6cc04ba959a9aba30d2a49b8171496ac3e0e3a6"
7+
"kernel-5.15.158.1.tar.gz": "e0620c81b0e04721afc8213b596ea76d14b3270e902012bc602e3d55934360b5"
88
}
99
}

SPECS/kernel-azure/kernel-azure.spec

Lines changed: 4 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.157.1
30+
Version: 5.15.158.1
3131
Release: 1%{?dist}
3232
License: GPLv2
3333
Vendor: Microsoft Corporation
@@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
420420
%{_sysconfdir}/bash_completion.d/bpftool
421421

422422
%changelog
423+
* Fri May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
424+
- Auto-upgrade to 5.15.158.1
425+
423426
* Tue Apr 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.1-1
424427
- Auto-upgrade to 5.15.157.1
425428

SPECS/kernel-hci/config

Lines changed: 3 additions & 2 deletions
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.157.1 Kernel Configuration
3+
# Linux/x86_64 5.15.158.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -500,7 +500,7 @@ CONFIG_LIVEPATCH=y
500500
# end of Processor type and features
501501

502502
CONFIG_CC_HAS_RETURN_THUNK=y
503-
CONFIG_SPECULATION_MITIGATIONS=y
503+
CONFIG_CPU_MITIGATIONS=y
504504
CONFIG_PAGE_TABLE_ISOLATION=y
505505
CONFIG_RETPOLINE=y
506506
CONFIG_RETHUNK=y
@@ -693,6 +693,7 @@ CONFIG_AS_AVX512=y
693693
CONFIG_AS_SHA1_NI=y
694694
CONFIG_AS_SHA256_NI=y
695695
CONFIG_AS_TPAUSE=y
696+
CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
696697

697698
#
698699
# General architecture-dependent options

0 commit comments

Comments
 (0)