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 B0317A0093 for ; Wed, 9 Mar 2022 12:03:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB6F4410EF; Wed, 9 Mar 2022 12:03:12 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 0B727410EF for ; Wed, 9 Mar 2022 12:03:11 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B37A93F79C for ; Wed, 9 Mar 2022 11:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823790; bh=MOM3Jf22WTvH2zz5kDfkh6q0sei+KmwUpas88Fxxnro=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rEDOKy+pPEefmBe+a72ODqMZaaQx3uraJwUa2NuVnRyDkCSby3UvWLyOr34CM54if yHZzbUVaxWES9hYoLRUH9IN1nYLNm4QgNDxvEfNVTWKKkm+UF7EBMgRtCXn30FA6Gb K9umibFTnd+IlFL6eo05T/uCopjGY+BnAtQDCusO97WsDHEZUCR0B2qU2I7zv9ttPL Bujoi7pffWnvhkOLOqyNn63VtunQmQWsR5ER29TNOnhKA/p4jILSFIgz8IErtIwGNl ostMSiHQDOCFIHlJ+OxqWbdBSjiymEhB06YacOkzpTnrxfHX1nwqQYUuB/eus5sYJr F0FfP9T21MkRw== Received: by mail-wm1-f71.google.com with SMTP id c19-20020a05600c0ad300b00385bb3db625so2449314wmr.4 for ; Wed, 09 Mar 2022 03:03:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MOM3Jf22WTvH2zz5kDfkh6q0sei+KmwUpas88Fxxnro=; b=fAJ26AfoV8WwetmL2YM776vNs4QF63ephxt4cgky4YzwvDqcna8AUK3X+1RFSl8QHb 0RWizjZOsGz0fWYQnfgyobdOaIf/Lo0BmPYonZHKquQcBla0LtcFNVKA4YTmUbqxHD69 sbgrFW2cAoPU4CiyYzrGlElIBu7U9gqVl5n7xcElGkO5I8QHqM7u+zjpRRzvKlH5gzuv pTrL69+wzWNuvAb3dDU2FXd2fT/Xc69SnJJP592x/dXfn+sU0JCIojmmfAUvjsGOiI/Q zPsbiK/K5UABma+897qA7M6GsyQ/0Dhlkz1lO0nYPykirWs6qS6xTs35mr92Nxa6nAxr BS/A== X-Gm-Message-State: AOAM533tqi7uTRAHeu7UaoDRMWs6phf/AF7QLxWW/KPyYPgKj983yjTI 9A4EZiQGtzr5esExYyLKS260Vfsf946gRM7mW+z18Bgm9PTovE8u8nV/Ny/reZSY8lMOfxC/zrK b27AzKaWrIkARiqhEo7rZhc3a X-Received: by 2002:a05:600c:5115:b0:389:bd64:85ab with SMTP id o21-20020a05600c511500b00389bd6485abmr7094281wms.32.1646823789962; Wed, 09 Mar 2022 03:03:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxD9HEJ484A2jhdvK8QyuF6mD7nMMI1AmdPceM32sI0VOvo9dy80K6EHlBN99TmmZCIOPTU3A== X-Received: by 2002:a05:600c:5115:b0:389:bd64:85ab with SMTP id o21-20020a05600c511500b00389bd6485abmr7094256wms.32.1646823789693; Wed, 09 Mar 2022 03:03:09 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id 9-20020a05600c268900b00381394d74a1sm1509439wmt.9.2022.03.09.03.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: Jie Hai Cc: Min Hu , dpdk stable 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 Message-Id: <20220309110116.1295395-33-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 --- >From bf1670a94c09410519868bb109bdc83f9a6db80e 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 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 {