From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82D17A00C2 for ; Tue, 8 Mar 2022 15:15:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D9364068B; Tue, 8 Mar 2022 15:15:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9345B40E03 for ; Tue, 8 Mar 2022 15:15:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5qWRCxohOzJg9v9+R6ScfnuMb4S3lJtq2E6BAROZvms=; b=U90rOGWOhU/xGtOt8NP9NR54WJ2THkmj+0APXxL7JDaVt6Dr+guAj3k3XIxg8GDCAH+zM1 hhVRRaUMWSrop8F2pvpFFnNgP32Kug11e2y9qHWmMDQ6AOJ8O6L40+3Mr6vB6ODH+n+Gok zQPRPaylYsjAiw/XYRfEUQ8KbQaOSnY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-197-DD35RjwNNFqqfXnHKDXVZQ-1; Tue, 08 Mar 2022 09:15:40 -0500 X-MC-Unique: DD35RjwNNFqqfXnHKDXVZQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEB401091DA3; Tue, 8 Mar 2022 14:15:38 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA9E584034; Tue, 8 Mar 2022 14:15:37 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: remove duplicate macro definition' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:25 +0000 Message-Id: <20220308141500.286915-10-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 03/14/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/a0f99531a65575042e630c96c632483024cf90b9 Thanks. Kevin --- >From a0f99531a65575042e630c96c632483024cf90b9 Mon Sep 17 00:00:00 2001 From: Jie Hai 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 Acked-by: Min Hu (Connor) --- 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 81bc9e9d98..f9addc6069 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -604,5 +604,4 @@ 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 */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.711353603 +0000 +++ 0010-net-hns3-remove-duplicate-macro-definition.patch 2022-03-08 13:55:28.396314887 +0000 @@ -1 +1 @@ -From 0983cdc1870f52a360eadb40eab84b34c20b464d Mon Sep 17 00:00:00 2001 +From a0f99531a65575042e630c96c632483024cf90b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0983cdc1870f52a360eadb40eab84b34c20b464d ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org