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 4149A42ECF for ; Thu, 20 Jul 2023 17:34:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D5EC40685; Thu, 20 Jul 2023 17:34:23 +0200 (CEST) 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 0747D400D6 for ; Thu, 20 Jul 2023 17:34:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867261; 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=zfiN4G447szD3PoErYHqcepyy1Qr4PdcFtfVhZBSKkQ=; b=KszSomCb92xUfjMIuIyYY7UFEcGIEsMIPKfTsihRwWIgolT5MFkAtzlOU/6ru7YnCDqORr MyO4XuCyW7DNVk+9G7tDnUsb29eoGsti+NCHDZu2xFXSsE+tIViSZ9Y+FapOL1ktOQ/TtM Wai5thkjtloIMDWwhGvB3nV+GP1hhrs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-66-PCyEvwf8OJ-kyPeR3FVSGQ-1; Thu, 20 Jul 2023 11:23:22 -0400 X-MC-Unique: PCyEvwf8OJ-kyPeR3FVSGQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56652101146C; Thu, 20 Jul 2023 15:22:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E5DC492C13; Thu, 20 Jul 2023 15:22:55 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: delete duplicate macro definition' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:08 +0100 Message-ID: <20230720151942.262154-117-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/b870ca9679262199b6d34a18cb4b431ff8016782 Thanks. Kevin --- >From b870ca9679262199b6d34a18cb4b431ff8016782 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Thu, 29 Jun 2023 21:21:26 +0800 Subject: [PATCH] net/hns3: delete duplicate macro definition [ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ] This patch delete some duplicate macro definitions. Fixes: a4c7152d0581 ("net/hns3: extract common code to its own file") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 878d4ae492..ff666c4979 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -877,11 +877,4 @@ struct hns3_adapter { }; -#define HNS3_DEVARG_RX_FUNC_HINT "rx_func_hint" -#define HNS3_DEVARG_TX_FUNC_HINT "tx_func_hint" - -#define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask" - -#define HNS3_DEVARG_MBX_TIME_LIMIT_MS "mbx_time_limit_ms" - enum { HNS3_DEV_SUPPORT_DCB_B, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:09.145840296 +0100 +++ 0117-net-hns3-delete-duplicate-macro-definition.patch 2023-07-20 16:17:55.115752362 +0100 @@ -1 +1 @@ -From a939584a45dff2c5d855d25bf4867ba07428bdfc Mon Sep 17 00:00:00 2001 +From b870ca9679262199b6d34a18cb4b431ff8016782 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index c58094d87b..c85a6912ad 100644 +index 878d4ae492..ff666c4979 100644 @@ -21 +22 @@ -@@ -874,11 +874,4 @@ struct hns3_adapter { +@@ -877,11 +877,4 @@ struct hns3_adapter { @@ -31 +32 @@ - enum hns3_dev_cap { + enum {