Skip to content

Commit 8ec776f

Browse files
CBL-Mariner-BotCBL-Mariner-Bot
authored
[AUTO-CHERRYPICK] [fasttrack 3.0] Upgrade kernels to 6.6.104.2 - branch 3.0-dev (microsoft#14714)
1 parent a6804bf commit 8ec776f

27 files changed

+90
-63
lines changed

‎SPECS-EXTENDED/kernel-ipe/config‎

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/x86_64 6.6.96.2 Kernel Configuration
3+
# Linux/x86_64 6.6.104.2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -545,6 +545,7 @@ CONFIG_CPU_SRSO=y
545545
CONFIG_MITIGATION_RFDS=y
546546
CONFIG_MITIGATION_SPECTRE_BHI=y
547547
CONFIG_MITIGATION_ITS=y
548+
CONFIG_MITIGATION_TSA=y
548549
CONFIG_ARCH_HAS_ADD_PAGES=y
549550

550551
#

‎SPECS-EXTENDED/kernel-ipe/config_aarch64‎

Lines changed: 2 additions & 3 deletions
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.96.2 Kernel Configuration
3+
# Linux/arm64 6.6.104.2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -2389,7 +2389,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
23892389
#
23902390
# Tegra firmware driver
23912391
#
2392-
# CONFIG_TEGRA_IVC is not set
23932392
# end of Tegra firmware driver
23942393

23952394
#
@@ -10024,7 +10023,7 @@ CONFIG_NVMEM_IMX_OCOTP_SCU=y
1002410023
# CONFIG_FPGA is not set
1002510024
# CONFIG_FSI is not set
1002610025
# CONFIG_TEE is not set
10027-
CONFIG_MULTIPLEXER=m
10026+
CONFIG_MULTIPLEXER=y
1002810027

1002910028
#
1003010029
# Multiplexer drivers

‎SPECS-EXTENDED/kernel-ipe/kernel-ipe.signatures.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config": "7655d8c92a7434ed24d7e70a90a5fbb2d0c96a49186e356bc517993454dcd39c",
5-
"config_aarch64": "f5e36a0539f4395386217319dea68713a96f742f70b4a13f55c6de08cabae8df",
4+
"config": "adba099aa28a48bd09b7b998d8d2e1d67aea2099a75d426a8b9100a6707fd4d1",
5+
"config_aarch64": "94a873573f94b1a5e72cc3a5e4b92b98c84ab8e18b036279e3a16b433d3de98b",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
88
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
99
"azl-ipe-boot-policy.pol": "f2b7941bd3b721aadc8e937d0472c36fe5e140221f7bb54af6ef905884e0372c",
1010
"Makefile": "1c2e740407215ed9b9cbbc09f9102bc99c08b370bbe2cbb0490aefdc9eb70455",
1111
"tarfs.c": "066084e1ca2c1e7ba83e76a6696cf17928e7efb46a2b1670a7a1f597c2d9bc51",
12-
"kernel-6.6.96.2.tar.gz": "e367d388de5dd5c891377cba4022e0b5887b060b0f842a7aa2c5b05229b30f87"
12+
"kernel-6.6.104.2.tar.gz": "dfc7b852fd9e63ce199c35721d00a5e4741c4e881da8235129f853402d784aa2"
1313
}
1414
}

‎SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
Summary: Linux Kernel
3434
Name: kernel-ipe
35-
Version: 6.6.96.2
36-
Release: 3%{?dist}
35+
Version: 6.6.104.2
36+
Release: 2%{?dist}
3737
License: GPLv2
3838
Vendor: Microsoft Corporation
3939
Distribution: Azure Linux
@@ -460,9 +460,12 @@ echo "initrd of kernel %{uname_r} removed" >&2
460460
%{_sysconfdir}/bash_completion.d/bpftool
461461

462462
%changelog
463-
* Fri Sep 12 2025 Rachel Menge <[email protected]> - 6.6.96.2-3
463+
* Tue Sep 23 2025 Rachel Menge <[email protected]> - 6.6.104.2-2
464464
- Bump release to match kernel
465465

466+
* Wed Sep 17 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.104.2-1
467+
- Auto-upgrade to 6.6.104.2
468+
466469
* Fri Aug 22 2025 Siddharth Chintamaneni <[email protected]> - 6.6.96.2-2
467470
- Added kernel-hwe as conflict.
468471
- Bump release to match kernel

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
%define uname_r %{version}-%{release}
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
9-
Version: 6.6.96.2
10-
Release: 3%{?dist}
9+
Version: 6.6.104.2
10+
Release: 2%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,9 +105,12 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108-
* Fri Sep 12 2025 Rachel Menge <[email protected]> - 6.6.96.2-3
108+
* Tue Sep 23 2025 Rachel Menge <[email protected]> - 6.6.104.2-2
109109
- Bump release to match kernel
110110

111+
* Wed Sep 17 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.104.2-1
112+
- Auto-upgrade to 6.6.104.2
113+
111114
* Fri Aug 22 2025 Siddharth Chintamaneni <[email protected]> - 6.6.96.2-2
112115
- Bump release to match kernel
113116

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

Lines changed: 6 additions & 3 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: 6.6.96.2
13-
Release: 3%{?dist}
12+
Version: 6.6.104.2
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,9 +145,12 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148-
* Fri Sep 12 2025 Rachel Menge <[email protected]> - 6.6.96.2-3
148+
* Tue Sep 23 2025 Rachel Menge <[email protected]> - 6.6.104.2-2
149149
- Bump release to match kernel
150150

151+
* Wed Sep 17 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.104.2-1
152+
- Auto-upgrade to 6.6.104.2
153+
151154
* Fri Aug 22 2025 Siddharth Chintamaneni <[email protected]> - 6.6.96.2-2
152155
- Bump release to match kernel
153156

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
%define kernelver %{version}-%{release}
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
8-
Version: 6.6.96.2
9-
Release: 3%{?dist}
8+
Version: 6.6.104.2
9+
Release: 2%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,9 +68,12 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71-
* Fri Sep 12 2025 Rachel Menge <[email protected]> - 6.6.96.2-3
71+
* Tue Sep 23 2025 Rachel Menge <[email protected]> - 6.6.104.2-2
7272
- Bump release to match kernel
7373

74+
* Wed Sep 17 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.104.2-1
75+
- Auto-upgrade to 6.6.104.2
76+
7477
* Fri Aug 22 2025 Siddharth Chintamaneni <[email protected]> - 6.6.96.2-2
7578
- Bump release to match kernel
7679

‎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-6.6.96.2.tar.gz": "e367d388de5dd5c891377cba4022e0b5887b060b0f842a7aa2c5b05229b30f87"
10+
"kernel-6.6.104.2.tar.gz": "dfc7b852fd9e63ce199c35721d00a5e4741c4e881da8235129f853402d784aa2"
1111
}
1212
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
Summary: Hyper-V daemons suite
1212
Name: hyperv-daemons
13-
Version: 6.6.96.2
13+
Version: 6.6.104.2
1414
Release: 1%{?dist}
1515
License: GPLv2+
1616
Vendor: Microsoft Corporation
@@ -221,6 +221,9 @@ fi
221221
%{_sbindir}/lsvmbus
222222

223223
%changelog
224+
* Wed Sep 17 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.104.2-1
225+
- Auto-upgrade to 6.6.104.2
226+
224227
* Fri Aug 15 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.96.2-1
225228
- Auto-upgrade to 6.6.96.2
226229

‎SPECS/kernel-64k/config_aarch64‎

Lines changed: 2 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/arm64 6.6.96.2 Kernel Configuration
3+
# Linux/arm64 6.6.104.2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -10050,7 +10050,7 @@ CONFIG_NVMEM_IMX_OCOTP_SCU=y
1005010050
# CONFIG_FPGA is not set
1005110051
# CONFIG_FSI is not set
1005210052
# CONFIG_TEE is not set
10053-
CONFIG_MULTIPLEXER=m
10053+
CONFIG_MULTIPLEXER=y
1005410054

1005510055
#
1005610056
# Multiplexer drivers

0 commit comments

Comments
 (0)