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 E975FA0A02 for ; Mon, 17 May 2021 18:14:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4466410F1; Mon, 17 May 2021 18:14:28 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8A07740041 for ; Mon, 17 May 2021 18:14:27 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsx-00083p-BQ; Mon, 17 May 2021 16:14:27 +0000 From: Christian Ehrhardt To: Hongbo Zheng Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:08:47 +0200 Message-Id: <20210517161039.3132619-98-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: delete redundant blank line' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/8d5643eb8e25120a353673b4971d5a2e10b42641 Thanks. Christian Ehrhardt --- >From 8d5643eb8e25120a353673b4971d5a2e10b42641 Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Wed, 31 Mar 2021 18:01:43 +0800 Subject: [PATCH] net/hns3: delete redundant blank line [ upstream commit d7e8b721fccc855b1d7a61e1e06d0d6921cf34fd ] Delete redundant blank line in "hns3vf_check_event_cause" to solve the static warning. Fixes: a5475d61fa34 ("net/hns3: support VF") Signed-off-by: Hongbo Zheng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev_vf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 913d6fd406..b4aedf82e0 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -926,7 +926,6 @@ hns3vf_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) /* Fetch the events from their corresponding regs */ cmdq_stat_reg = hns3_read_dev(hw, HNS3_VECTOR0_CMDQ_STAT_REG); - if (BIT(HNS3_VECTOR0_RST_INT_B) & cmdq_stat_reg) { rst_ing_reg = hns3_read_dev(hw, HNS3_FUN_RST_ING); hns3_warn(hw, "resetting reg: 0x%x", rst_ing_reg); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.321423501 +0200 +++ 0098-net-hns3-delete-redundant-blank-line.patch 2021-05-17 17:40:29.303810514 +0200 @@ -1 +1 @@ -From d7e8b721fccc855b1d7a61e1e06d0d6921cf34fd Mon Sep 17 00:00:00 2001 +From 8d5643eb8e25120a353673b4971d5a2e10b42641 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7e8b721fccc855b1d7a61e1e06d0d6921cf34fd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index eb47ed320a..5f8a460f35 100644 +index 913d6fd406..b4aedf82e0 100644 @@ -22 +23 @@ -@@ -1064,7 +1064,6 @@ hns3vf_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -926,7 +926,6 @@ hns3vf_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)