Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for Azure
Name: kernel-azure-signed-%{buildarch}
Version: 5.15.176.3
Release: 3%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
- Bump to match kernel-azure spec

Expand Down
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for HCI
Name: kernel-hci-signed-%{buildarch}
Version: 5.15.176.3
Release: 2%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Tue Feb 11 2025 Rachel Menge <rachelmenge@microsoft.com> - 5.15.176.3-2
- Bump release to match kernel-hci

Expand Down
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-signed/kernel-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.176.3
Release: 3%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
- Bump release to match kernel

Expand Down
2 changes: 1 addition & 1 deletion SPECS/hyperv-daemons/hyperv-daemons.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
}
}
5 changes: 4 additions & 1 deletion SPECS/hyperv-daemons/hyperv-daemons.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%global udev_prefix 70
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 5.15.176.3
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -219,6 +219,9 @@ fi
%{_sbindir}/lsvmbus

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Mon Feb 10 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.176.3-1
- Auto-upgrade to 5.15.176.3

Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel-azure/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.176.3 Kernel Configuration
# Linux/x86_64 5.15.179.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -862,6 +862,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_BSGLIB=y
Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel-azure/config_aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.176.3 Kernel Configuration
# Linux/arm64 5.15.179.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -841,6 +841,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_BSGLIB=y
Expand Down
6 changes: 3 additions & 3 deletions SPECS/kernel-azure/kernel-azure.signatures.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"Signatures": {
"cbl-mariner-ca-20211013-20230216.pem": "228046d92ccb7d268cf4f195425c0f990afa00a968cc940fb1df4629fb7a6765",
"config": "709587c5500af8f805ecfbd62b49c64a1e2c9ce21e1f0e09e992508f96663bd5",
"config_aarch64": "dee6946a414d8d82990b9509e0f41ed490c071fcd560cf6b34234b0994b62064",
"config": "ece0679da97fc9292b9f1e9cf9cd18ca617260619ae97163d5f0950015785a70",
"config_aarch64": "5bd7876907e7a86af490310ae076124fa68f7d097254e4c19962ea990a8660b4",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel-azure/kernel-azure.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

Summary: Linux Kernel
Name: kernel-azure
Version: 5.15.176.3
Release: 3%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
- Disable AX25 Amateur Radio protocol support

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 0106c67e8ccb..259fcc168340 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -83,6 +83,7 @@ enum mlx5_flow_namespace_type {
MLX5_FLOW_NAMESPACE_RDMA_RX,
MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL,
@@ -85,6 +85,7 @@ enum mlx5_flow_namespace_type {
MLX5_FLOW_NAMESPACE_RDMA_TX,
MLX5_FLOW_NAMESPACE_RDMA_RX_COUNTERS,
MLX5_FLOW_NAMESPACE_RDMA_TX_COUNTERS,
+ MLX5_FLOW_NAMESPACE_PORT_SEL,
};

Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel-hci/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.176.3 Kernel Configuration
# Linux/x86_64 5.15.179.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -858,6 +858,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_BSGLIB=y
Expand Down
4 changes: 2 additions & 2 deletions SPECS/kernel-hci/kernel-hci.signatures.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Signatures": {
"cbl-mariner-ca-20211013-20230216.pem": "228046d92ccb7d268cf4f195425c0f990afa00a968cc940fb1df4629fb7a6765",
"config": "882cde4f2473efbaaf735c32ded1b15e47055c2a3df90809c2812013eeb92a56",
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
"config": "46fed1436642b2efb2df2709c1ecc8049002ecd21955a15d0b11f44d0e7a8617",
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel-hci/kernel-hci.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
%define config_source %{SOURCE1}
Summary: Linux Kernel for HCI
Name: kernel-hci
Version: 5.15.176.3
Release: 2%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -545,6 +545,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Tue Feb 11 2025 Rachel Menge <rachelmenge@microsoft.com> - 5.15.176.3-2
- Append 20230216 key to CBL-Mariner key

Expand Down
2 changes: 1 addition & 1 deletion SPECS/kernel-headers/kernel-headers.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel-headers/kernel-headers.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

Summary: Linux API header files
Name: kernel-headers
Version: 5.15.176.3
Release: 3%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -73,6 +73,9 @@ done
%endif

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
- Bump release to match kernel

Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.176.3 Kernel Configuration
# Linux/x86_64 5.15.179.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -863,6 +863,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_BSGLIB=y
Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel/config_aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.176.3 Kernel Configuration
# Linux/arm64 5.15.179.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -841,6 +841,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
CONFIG_BLOCK_LEGACY_AUTOLOAD=y
CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_BSGLIB=y
Expand Down
6 changes: 3 additions & 3 deletions SPECS/kernel/kernel.signatures.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"Signatures": {
"cbl-mariner-ca-20211013-20230216.pem": "228046d92ccb7d268cf4f195425c0f990afa00a968cc940fb1df4629fb7a6765",
"config": "c6c28fba7ee15b5dd9cd75006350eb2fe3cb2f907fde4511f102c3c8edf8c370",
"config_aarch64": "3ea6095b7f26f0b179cc6502f0cc0e1c5ee54898a07c45fa1d549e25e8cfa608",
"config": "373f9762e36afc92abee4762e8f79f17d698c96355c51d8cc692eaf5a21a44bc",
"config_aarch64": "f351b39327c3f9faae08c040ad3dc43c280c003c04f88447b4a68cc14b1d3f44",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.176.3.tar.gz": "d7a029ae0897929f983b89aa902897adcd057028206818014fa7648a854581a3"
"kernel-5.15.179.1.tar.gz": "7cc3501908a85a8c8a771fc1a56c8095235a2e843ceb93c819331673ea70ab11"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel/kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

Summary: Linux Kernel
Name: kernel
Version: 5.15.176.3
Release: 3%{?dist}
Version: 5.15.179.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -426,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu Apr 03 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.179.1-1
- Auto-upgrade to 5.15.179.1

* Sat Feb 22 2025 Chris Co <chrco@microsoft.com> - 5.15.176.3-3
- Disable AX25 Amateur Radio protocol support

Expand Down
20 changes: 10 additions & 10 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6530,8 +6530,8 @@
"type": "other",
"other": {
"name": "hyperv-daemons",
"version": "5.15.176.3",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.176.3.tar.gz"
"version": "5.15.179.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.179.1.tar.gz"
}
}
},
Expand Down Expand Up @@ -8111,8 +8111,8 @@
"type": "other",
"other": {
"name": "kernel",
"version": "5.15.176.3",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.176.3.tar.gz"
"version": "5.15.179.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.179.1.tar.gz"
}
}
},
Expand All @@ -8121,8 +8121,8 @@
"type": "other",
"other": {
"name": "kernel-azure",
"version": "5.15.176.3",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.176.3.tar.gz"
"version": "5.15.179.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.179.1.tar.gz"
}
}
},
Expand All @@ -8131,8 +8131,8 @@
"type": "other",
"other": {
"name": "kernel-hci",
"version": "5.15.176.3",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.176.3.tar.gz"
"version": "5.15.179.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.179.1.tar.gz"
}
}
},
Expand All @@ -8141,8 +8141,8 @@
"type": "other",
"other": {
"name": "kernel-headers",
"version": "5.15.176.3",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.176.3.tar.gz"
"version": "5.15.179.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.179.1.tar.gz"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-20.cm2.aarch64.rpm
kernel-headers-5.15.176.3-3.cm2.noarch.rpm
kernel-headers-5.15.179.1-1.cm2.noarch.rpm
glibc-2.35-7.cm2.aarch64.rpm
glibc-devel-2.35-7.cm2.aarch64.rpm
glibc-i18n-2.35-7.cm2.aarch64.rpm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-20.cm2.x86_64.rpm
kernel-headers-5.15.176.3-3.cm2.noarch.rpm
kernel-headers-5.15.179.1-1.cm2.noarch.rpm
glibc-2.35-7.cm2.x86_64.rpm
glibc-devel-2.35-7.cm2.x86_64.rpm
glibc-i18n-2.35-7.cm2.x86_64.rpm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.176.3-3.cm2.noarch.rpm
kernel-headers-5.15.179.1-1.cm2.noarch.rpm
kmod-29-2.cm2.aarch64.rpm
kmod-debuginfo-29-2.cm2.aarch64.rpm
kmod-devel-29-2.cm2.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-cross-headers-5.15.176.3-3.cm2.noarch.rpm
kernel-headers-5.15.176.3-3.cm2.noarch.rpm
kernel-cross-headers-5.15.179.1-1.cm2.noarch.rpm
kernel-headers-5.15.179.1-1.cm2.noarch.rpm
kmod-29-2.cm2.x86_64.rpm
kmod-debuginfo-29-2.cm2.x86_64.rpm
kmod-devel-29-2.cm2.x86_64.rpm
Expand Down
Loading