From 680c18544859fd650e89c9ae20ae62deb28e901a Mon Sep 17 00:00:00 2001 From: Vince Perri <5596945+vinceaperri@users.noreply.github.com> Date: Tue, 23 Jan 2024 22:38:47 -0500 Subject: [PATCH] kernel-hci: Add missing commit subject to patch 27 (#7165) --- .../kernel-hci-signed/kernel-hci-signed.spec | 5 ++++- ...dge-Use-debug-instead-of-warn-if-entry-d.patch} | 14 +++++++++----- SPECS/kernel-hci/kernel-hci.spec | 8 ++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) rename SPECS/kernel-hci/{0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch => 0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch} (80%) diff --git a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec index c8afee3c7a..64fac8ce7a 100644 --- a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec +++ b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec @@ -5,7 +5,7 @@ Summary: Signed Linux Kernel for HCI Name: kernel-hci-signed-%{buildarch} Version: 5.15.145.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Mon Jan 22 2024 Vince Perri - 5.15.145.2-2 +- Bump release to match kernel + * Tue Jan 16 2024 Gary Swalling - 5.15.145.2-1 - Update to 5.15.145.2 diff --git a/SPECS/kernel-hci/0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch b/SPECS/kernel-hci/0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch similarity index 80% rename from SPECS/kernel-hci/0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch rename to SPECS/kernel-hci/0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch index 7bf4f2d909..536c1ee7bb 100644 --- a/SPECS/kernel-hci/0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch +++ b/SPECS/kernel-hci/0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch @@ -1,13 +1,17 @@ -From: Roi Dayan +From ea645f97bcec90a818dc6915d84cd0f752d9ccfd Mon Sep 17 00:00:00 2001 +From: Roi Dayan +Date: Thu, 27 Oct 2022 11:35:12 +0300 +Subject: [PATCH] net/mlx5: Bridge, Use debug instead of warn if entry doesn't + exists There is no need for the warn if entry already removed. Use debug print like in the update flow. Also update the messages so user can identify if the it's from the update flow or remove flow. -Signed-off-by: Roi Dayan -Reviewed-by: Vlad Buslov -Signed-off-by: Saeed Mahameed +Signed-off-by: Roi Dayan +Reviewed-by: Vlad Buslov +Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -39,4 +43,4 @@ index 4fbff7bcc155..b176648d1343 100644 } -- -2.38.1 +2.31.1 diff --git a/SPECS/kernel-hci/kernel-hci.spec b/SPECS/kernel-hci/kernel-hci.spec index 43e172007a..58e8c1d145 100644 --- a/SPECS/kernel-hci/kernel-hci.spec +++ b/SPECS/kernel-hci/kernel-hci.spec @@ -18,7 +18,7 @@ Summary: Linux Kernel for HCI Name: kernel-hci Version: 5.15.145.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -54,7 +54,7 @@ Patch23: 0024-net-mlx5-Bridge-extract-VLAN-push-pop-actions-creati.patch Patch24: 0025-net-mlx5-Bridge-implement-infrastructure-for-VLAN-pr.patch Patch25: 0026-net-mlx5-Bridge-implement-QinQ-support.patch Patch26: 0027-mstflint-This-driver-enables-under-the-secure-boot.patch -Patch27: 0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch +Patch27: 0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc @@ -435,6 +435,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Mon Jan 22 2024 Vince Perri - 5.15.145.2-2 +- Fix header for patch 27 and rename to +- 0028-net-mlx5-Bridge-Use-debug-instead-of-warn-if-entry-d.patch + * Tue Jan 16 2024 Gary Swalling - 5.15.145.2-1 - Update to 5.15.145.2