From: christian.ehrhardt@canonical.com
To: Jie Hai <haijie1@huawei.com>
Cc: Min Hu <humin29@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/hns3: remove duplicate macro definition' has been queued to stable release 19.11.12
Date: Wed, 9 Mar 2022 12:01:04 +0100 [thread overview]
Message-ID: <20220309110116.1295395-33-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com>
Hi,
FYI, your patch has been queued to stable release 19.11.12
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/11/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/cpaelzer/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/bf1670a94c09410519868bb109bdc83f9a6db80e
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From bf1670a94c09410519868bb109bdc83f9a6db80e Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Mon, 28 Feb 2022 11:21:41 +0800
Subject: [PATCH] net/hns3: remove duplicate macro definition
[ upstream commit 0983cdc1870f52a360eadb40eab84b34c20b464d ]
This patch fixes duplicate macro definition of HNS3_RSS_CFG_TBL_SIZE.
Fixes: 737f30e1c3ab ("net/hns3: support command interface with firmware")
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
---
drivers/net/hns3/hns3_cmd.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index ea4ae4aebc..58b44cdc7c 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -508,7 +508,6 @@ struct hns3_cfg_gro_status_cmd {
#define HNS3_RSS_HASH_KEY_OFFSET_B 4
-#define HNS3_RSS_CFG_TBL_SIZE 16
#define HNS3_RSS_HASH_KEY_NUM 16
/* Configure the algorithm mode and Hash Key, opcode:0x0D01 */
struct hns3_rss_generic_config_cmd {
--
2.35.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-03-09 11:57:45.087725352 +0100
+++ 0033-net-hns3-remove-duplicate-macro-definition.patch 2022-03-09 11:57:43.400938432 +0100
@@ -1 +1 @@
-From 0983cdc1870f52a360eadb40eab84b34c20b464d Mon Sep 17 00:00:00 2001
+From bf1670a94c09410519868bb109bdc83f9a6db80e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0983cdc1870f52a360eadb40eab84b34c20b464d ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 81bc9e9d98..f9addc6069 100644
+index ea4ae4aebc..58b44cdc7c 100644
@@ -21 +22 @@
-@@ -603,7 +603,6 @@ struct hns3_cfg_gro_status_cmd {
+@@ -508,7 +508,6 @@ struct hns3_cfg_gro_status_cmd {
next prev parent reply other threads:[~2022-03-09 11:03 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 11:00 patch 'eventdev/eth_tx: fix queue add error code' " christian.ehrhardt
2022-03-09 11:00 ` patch 'telemetry: add missing C++ guards' " christian.ehrhardt
2022-03-09 11:00 ` patch 'acl: " christian.ehrhardt
2022-03-09 11:00 ` patch 'compressdev: " christian.ehrhardt
2022-03-09 11:00 ` patch 'eventdev: " christian.ehrhardt
2022-03-09 11:00 ` patch 'kni: " christian.ehrhardt
2022-03-09 11:00 ` patch 'ethdev: fix cast for C++ compatibility' " christian.ehrhardt
2022-03-09 11:00 ` patch 'cryptodev: fix RSA key type name' " christian.ehrhardt
2022-03-09 11:00 ` patch 'doc: fix FIPS guide' " christian.ehrhardt
2022-03-09 11:00 ` patch 'examples/l2fwd-crypto: fix port mask overflow' " christian.ehrhardt
2022-03-09 11:00 ` patch 'crypto/virtio: fix out-of-bounds access' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/nfb: fix array indexes in deinit functions' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/nfb: fix multicast/promiscuous mode switching' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ixgbe: reset security context pointer on close' " christian.ehrhardt
2022-03-09 11:00 ` patch 'app/testpmd: check starting port is not in bonding' " christian.ehrhardt
2022-03-09 11:00 ` patch 'vhost: fix unsafe vring addresses modifications' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/af_xdp: add missing trailing newline in logs' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ena: remove unused enumeration' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ena: remove unused offload variables' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ena: skip timer if reset is triggered' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ena: fix meta descriptor DF flag setup' " christian.ehrhardt
2022-03-09 11:00 ` patch 'net/ena: fix checksum flag for L4' " christian.ehrhardt
2022-03-09 11:00 ` patch 'doc: remove obsolete vector Tx explanations from mlx5 guide' " christian.ehrhardt
2022-03-09 11:00 ` patch 'doc: replace broken links in mlx guides' " christian.ehrhardt
2022-03-09 11:00 ` patch 'app/testpmd: fix build without drivers' " christian.ehrhardt
2022-03-09 11:00 ` patch 'test/efd: fix sockets mask size' " christian.ehrhardt
2022-03-09 11:00 ` patch 'distributor: fix potential overflow' " christian.ehrhardt
2022-03-09 11:00 ` patch 'eal/linux: fix illegal memory access in uevent handler' " christian.ehrhardt
2022-03-09 11:01 ` patch 'kni: fix freeing order in device release' " christian.ehrhardt
2022-03-09 11:01 ` patch 'app/compress-perf: fix socket ID type during init' " christian.ehrhardt
2022-03-09 11:01 ` patch 'app/compress-perf: fix number of queue pairs to setup' " christian.ehrhardt
2022-03-09 11:01 ` patch 'compressdev: fix socket ID type' " christian.ehrhardt
2022-03-09 11:01 ` christian.ehrhardt [this message]
2022-03-09 11:01 ` patch 'net/hns3: fix RSS TC mode entry' " christian.ehrhardt
2022-03-09 11:01 ` patch 'net/hns3: fix VF " christian.ehrhardt
2022-03-09 11:01 ` patch 'net/hns3: increase time waiting for PF reset completion' " christian.ehrhardt
2022-03-09 11:01 ` patch 'net/ixgbe: fix FSP check for X550EM devices' " christian.ehrhardt
2022-03-09 11:01 ` patch 'doc: fix typos and punctuation in flow API guide' " christian.ehrhardt
2022-03-09 11:01 ` patch 'net/mlx5: fix matcher priority with ICMP or ICMPv6' " christian.ehrhardt
2022-03-09 11:01 ` patch 'raw/ifpga: fix variable initialization in probing' " christian.ehrhardt
2022-03-09 11:01 ` patch 'app/pdump: abort on multi-core capture limit' " christian.ehrhardt
2022-03-09 11:01 ` patch 'examples/distributor: reduce Tx queue number to 1' " christian.ehrhardt
2022-03-09 11:01 ` patch 'examples/flow_classify: fix failure message' " christian.ehrhardt
2022-03-09 11:01 ` patch 'ethdev: fix doxygen comments for device info struct' " christian.ehrhardt
2022-03-09 11:01 ` patch 'net/mlx5: fix modify port action validation' " christian.ehrhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220309110116.1295395-33-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=haijie1@huawei.com \
--cc=humin29@huawei.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).