From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 424B8A046B for ; Mon, 24 Jun 2019 17:27:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 376F21BE8E; Mon, 24 Jun 2019 17:27:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C0C311BEF1 for ; Mon, 24 Jun 2019 17:27:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36D3B30C34CC; Mon, 24 Jun 2019 15:27:01 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA19419C6A; Mon, 24 Jun 2019 15:26:59 +0000 (UTC) From: Kevin Traynor To: Naresh Kumar PBS Cc: Ajit Khaparde , Lance Richardson , dpdk stable Date: Mon, 24 Jun 2019 16:25:04 +0100 Message-Id: <20190624152525.19349-40-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 24 Jun 2019 15:27:01 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix icc build' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4dfbacf9f0be7a9fcacfebe49df81eeb6ebdccd6 Thanks. Kevin Traynor --- >From 4dfbacf9f0be7a9fcacfebe49df81eeb6ebdccd6 Mon Sep 17 00:00:00 2001 From: Naresh Kumar PBS Date: Sat, 8 Jun 2019 23:22:08 +0400 Subject: [PATCH] net/bnxt: fix icc build [ upstream commit bc77ad80e619637d5e4f9cdfda9fca8d7dc1bef9 ] Address build errors reported by intel compiler while compiling on Windows. Instead of typeof() using the actual type in ALLOW_FUNC Signed-off-by: Naresh Kumar PBS Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f937caa5a..2c18b3732 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3221,5 +3221,5 @@ init_err_disable: #define ALLOW_FUNC(x) \ { \ - typeof(x) arg = (x); \ + uint32_t arg = (x); \ bp->pf.vf_req_fwd[((arg) >> 5)] &= \ ~rte_cpu_to_le_32(1 << ((arg) & 0x1f)); \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.148506258 +0100 +++ 0040-net-bnxt-fix-icc-build.patch 2019-06-24 16:18:55.076430161 +0100 @@ -1 +1 @@ -From bc77ad80e619637d5e4f9cdfda9fca8d7dc1bef9 Mon Sep 17 00:00:00 2001 +From 4dfbacf9f0be7a9fcacfebe49df81eeb6ebdccd6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc77ad80e619637d5e4f9cdfda9fca8d7dc1bef9 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -19 +19 @@ -index 12fb0a76e..5f9c096a7 100644 +index f937caa5a..2c18b3732 100644 @@ -22 +22 @@ -@@ -3640,5 +3640,5 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) +@@ -3221,5 +3221,5 @@ init_err_disable: