Skip to content

Commit 9af6b0b

Browse files
rlmengeCBL-Mariner-Botvinceaperri
authored
Kernel upgrade to 5.15.179.1 (#13279)
Upgrade to LTS version 5.15.179.1 This upgrade required an update to kernel-hci's patches. CONFIG_BLOCK_LEGACY_AUTOLOAD=y was also introduced as a result of microsoft/CBL-Mariner-Linux-Kernel@6327dac . Keeping on to continue to support legacy behavior on 5.15. Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com> Co-authored-by: Vince Perri <5596945+vinceaperri@users.noreply.github.com>
1 parent fdafa57 commit 9af6b0b

24 files changed

Lines changed: 77 additions & 48 deletions

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

Lines changed: 5 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 Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.176.3
13-
Release: 3%{?dist}
12+
Version: 5.15.179.1
13+
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
157+
- Auto-upgrade to 5.15.179.1
158+
156159
* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
157160
- Bump to match kernel-azure spec
158161

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

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

151151
%changelog
152+
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
153+
- Auto-upgrade to 5.15.179.1
154+
152155
* Tue Feb 11 2025 Rachel Menge <rachelmenge@microsoft.com> - 5.15.176.3-2
153156
- Bump release to match kernel-hci
154157

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

Lines changed: 5 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.176.3
13-
Release: 3%{?dist}
12+
Version: 5.15.179.1
13+
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
157+
- Auto-upgrade to 5.15.179.1
158+
156159
* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
157160
- Bump release to match kernel
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.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
10+
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
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.176.3
11+
Version: 5.15.179.1
1212
Release: 1%{?dist}
1313
License: GPLv2+
1414
Vendor: Microsoft Corporation
@@ -219,6 +219,9 @@ fi
219219
%{_sbindir}/lsvmbus
220220

221221
%changelog
222+
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
223+
- Auto-upgrade to 5.15.179.1
224+
222225
* Mon Feb 10 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.176.3-1
223226
- Auto-upgrade to 5.15.176.3
224227

‎SPECS/kernel-azure/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 5.15.176.3 Kernel Configuration
3+
# Linux/x86_64 5.15.179.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -862,6 +862,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
862862
# CONFIG_TRIM_UNUSED_KSYMS is not set
863863
CONFIG_MODULES_TREE_LOOKUP=y
864864
CONFIG_BLOCK=y
865+
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
865866
CONFIG_BLK_CGROUP_RWSTAT=y
866867
CONFIG_BLK_DEV_BSG_COMMON=y
867868
CONFIG_BLK_DEV_BSGLIB=y

‎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.176.3 Kernel Configuration
3+
# Linux/arm64 5.15.179.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -841,6 +841,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
841841
# CONFIG_TRIM_UNUSED_KSYMS is not set
842842
CONFIG_MODULES_TREE_LOOKUP=y
843843
CONFIG_BLOCK=y
844+
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
844845
CONFIG_BLK_CGROUP_RWSTAT=y
845846
CONFIG_BLK_DEV_BSG_COMMON=y
846847
CONFIG_BLK_DEV_BSGLIB=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-20230216.pem": "228046d92ccb7d268cf4f195425c0f990afa00a968cc940fb1df4629fb7a6765",
4-
"config": "709587c5500af8f805ecfbd62b49c64a1e2c9ce21e1f0e09e992508f96663bd5",
5-
"config_aarch64": "dee6946a414d8d82990b9509e0f41ed490c071fcd560cf6b34234b0994b62064",
4+
"config": "ece0679da97fc9292b9f1e9cf9cd18ca617260619ae97163d5f0950015785a70",
5+
"config_aarch64": "5bd7876907e7a86af490310ae076124fa68f7d097254e4c19962ea990a8660b4",
66
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
7-
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
7+
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
88
}
99
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
Summary: Linux Kernel
2929
Name: kernel-azure
30-
Version: 5.15.176.3
31-
Release: 3%{?dist}
30+
Version: 5.15.179.1
31+
Release: 1%{?dist}
3232
License: GPLv2
3333
Vendor: Microsoft Corporation
3434
Distribution: Mariner
@@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
420420
%{_sysconfdir}/bash_completion.d/bpftool
421421

422422
%changelog
423+
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
424+
- Auto-upgrade to 5.15.179.1
425+
423426
* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
424427
- Disable AX25 Amateur Radio protocol support
425428

‎SPECS/kernel-hci/0002-net-mlx5-Introduce-port-selection-namespace.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
189189
index 0106c67e8ccb..259fcc168340 100644
190190
--- a/include/linux/mlx5/fs.h
191191
+++ b/include/linux/mlx5/fs.h
192-
@@ -83,6 +83,7 @@ enum mlx5_flow_namespace_type {
193-
MLX5_FLOW_NAMESPACE_RDMA_RX,
194-
MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL,
192+
@@ -85,6 +85,7 @@ enum mlx5_flow_namespace_type {
195193
MLX5_FLOW_NAMESPACE_RDMA_TX,
194+
MLX5_FLOW_NAMESPACE_RDMA_RX_COUNTERS,
195+
MLX5_FLOW_NAMESPACE_RDMA_TX_COUNTERS,
196196
+ MLX5_FLOW_NAMESPACE_PORT_SEL,
197197
};
198198

0 commit comments

Comments
 (0)