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 84969A0093 for ; Wed, 9 Mar 2022 17:31:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F9C440687; Wed, 9 Mar 2022 17:31:15 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 3A17B4013F for ; Wed, 9 Mar 2022 17:31:14 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id j26so3953312wrb.1 for ; Wed, 09 Mar 2022 08:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=goY1Ui2s98SudNGf9kugKWKvVOFjPOgvw7uPCWAXYVA=; b=RMDhdVq10B9hE7C0iJmEYPntn7dJgOo/rsz46xsBXoM7eKjEHmYHp6p9zD4Nbas9s2 eyJwb1HvLOu3bBBiYeNXOzYQ+qVBp9AVoXT2dyIty3A2kPtHdcAVC0+uy5KCXVNHkj+8 6cpK0HYo7YfZguExGDEdPbMk+5LDTWn8eoFruiT//wXfEBt0ZqxJaUGtui+BiZWIR9yJ FzV+Sh3z1acbZ39nnLnE09R9pTtqF9xXG7zv2+3GpEdkF7QL+FSKmaJXua6LrfgVRyEL 38lDWG08F6dSHONKxKeRA0zzwSJ1pXLYIzltlJ0kA8z4B6zctSn2DtIu5UD6YF0hJ2uO 1bow== 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=goY1Ui2s98SudNGf9kugKWKvVOFjPOgvw7uPCWAXYVA=; b=xa0Rn0LerpHhHVyOVqVTNd6c8dHCnGi/17ZDAcMs1uh/UFqBy6+XDKoPPCLBoFRnie 6TIh3iNVIiQKu4gPeox1eHWFyd1zYScMrIKRDBlZi+Vp5uLcV4OjqU3RSuk3JIjH7/Lg cFzdM4sv9UBjOnPP3lvrs2PCzs6OuppLSn2ekFZfzI3y8vQTlPmYDd+tB9EJrFbxFIwm FaZvqB5F4M+Yv/OlO0ZfRsxXpupbGMZRepH6U+TmAfIxUnfq/TAXTKCUlhKfoiyK0R+y Lozanho7aUkpQj/+1FVPADkk+MsG8I/TaZf3O5ILacguoe2KeIHQqw/Ad6RW3FIWre1b IFBA== X-Gm-Message-State: AOAM530L0UES91RPM4kMaMOiT/ktCBuce94ET2QsAv3FfmjOEdThQI+c 2nMAVZJed3h31ix/H5OCLcM= X-Google-Smtp-Source: ABdhPJwMyOKqoRufoDPk/vWz/jHiG1sCmTeUpeSAMkIYblIrU6pqGklc070uTyRL9QvfE6vWnOW3uQ== X-Received: by 2002:a05:6000:188b:b0:1f1:ed77:2f29 with SMTP id a11-20020a056000188b00b001f1ed772f29mr317834wri.413.1646843473925; Wed, 09 Mar 2022 08:31:13 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id o6-20020a05600c4fc600b00389d7b820a3sm42592wmq.28.2022.03.09.08.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:13 -0800 (PST) From: luca.boccassi@gmail.com To: Jie Hai Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: remove duplicate macro definition' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:22 +0000 Message-Id: <20220309163053.245754-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.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 20.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 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/af3bd943eed8e6f872ce37acd617b1eb41f7a530 Thanks. Luca Boccassi --- >From af3bd943eed8e6f872ce37acd617b1eb41f7a530 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 0463acb215..344474db6f 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -557,7 +557,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:08.780944960 +0000 +++ 0006-net-hns3-remove-duplicate-macro-definition.patch 2022-03-09 16:30:08.487023811 +0000 @@ -1 +1 @@ -From 0983cdc1870f52a360eadb40eab84b34c20b464d Mon Sep 17 00:00:00 2001 +From af3bd943eed8e6f872ce37acd617b1eb41f7a530 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 0463acb215..344474db6f 100644 @@ -21 +22 @@ -@@ -603,7 +603,6 @@ struct hns3_cfg_gro_status_cmd { +@@ -557,7 +557,6 @@ struct hns3_cfg_gro_status_cmd {