patch 'net/iavf: remove git residue symbol' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Mon Feb 21 16:33:46 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/85e84c5930e20d1d9ea1e2df47c2be37301a05fc

Thanks.

Kevin

---
>From 85e84c5930e20d1d9ea1e2df47c2be37301a05fc Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Thu, 16 Dec 2021 12:43:42 +0800
Subject: [PATCH] net/iavf: remove git residue symbol

[ upstream commit 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 ]

This extra symbol '+' should be added when patch was reapplied, and the
compiler treats it as unsigned type, so the code still runs well.

Fixes: 84108425054a ("net/iavf: support asynchronous virtual channel message")

Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
Acked-by: Radu Nicolau <radu.nicolau at intel.com>
---
 drivers/net/iavf/iavf_vchnl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 7602691649..169e1f2012 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -503,5 +503,5 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
 		VIRTCHNL_VF_LARGE_NUM_QPAIRS |
 		VIRTCHNL_VF_OFFLOAD_QOS |
-+		VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO;
+		VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO;
 
 	args.in_args = (uint8_t *)∩︀
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:45.458700226 +0000
+++ 0037-net-iavf-remove-git-residue-symbol.patch	2022-02-21 15:22:44.080704101 +0000
@@ -1 +1 @@
-From 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 Mon Sep 17 00:00:00 2001
+From 85e84c5930e20d1d9ea1e2df47c2be37301a05fc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list