From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 15996A054C for ; Fri, 14 Feb 2020 18:06:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BB9511A4; Fri, 14 Feb 2020 18:06:36 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id ACAE111A4 for ; Fri, 14 Feb 2020 18:06:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699994; 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=88bLs69s4CUIvmBFK+8GM3rkOc5SEEL8LtFsN4ut/fc=; b=ci5zNONEk3JPk+YhStIQN3x4PE6KAExLsksPuTnitjs7UlLiSGMjjETOVN+IcPxqDo7FB2 P4DMljrJYPZEvXjipyCugxHILZwG8mCYztdgOaXuR4DswEs+ds7xvzr2ghVL9ntNzqm4EZ EpV/ggYgf99tPgejAAfRFSoi47wEbqw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-Lc9aSu-ONSinjc90So5TdQ-1; Fri, 14 Feb 2020 12:06:31 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EFEE2107ACC7; Fri, 14 Feb 2020 17:06:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F1EA84BCD; Fri, 14 Feb 2020 17:06:27 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Date: Fri, 14 Feb 2020 17:03:36 +0000 Message-Id: <20200214170337.25093-42-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Lc9aSu-ONSinjc90So5TdQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'app/pdump: fix build with clang' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/20. 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 rebasi= ng (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/3cfe805b2d4eb746de= 9e940e6a922ad85a8c0bc7 Thanks. Kevin. --- >From 3cfe805b2d4eb746de9e940e6a922ad85a8c0bc7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 25 Jan 2020 17:04:38 -0800 Subject: [PATCH] app/pdump: fix build with clang [ upstream commit ab30f26aaaa025121bdf804152ade031ce9d7c0a ] Clang checks indentation and found incorrect indentation in pdump. app/pdump/main.c:598:3: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing") Signed-off-by: Stephen Hemminger --- app/pdump/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index ccf2a1d2f7..3f1bed89ff 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -557,5 +557,5 @@ configure_vdev(uint16_t port_id) =09=09rte_exit(EXIT_FAILURE, "dev config failed\n"); =20 -=09 for (q =3D 0; q < txRings; q++) { +=09for (q =3D 0; q < txRings; q++) { =09=09ret =3D rte_eth_tx_queue_setup(port_id, q, TX_DESC_PER_QUEUE, =09=09=09=09rte_eth_dev_socket_id(port_id), NULL); --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:39.382358035 +0000 +++ 0042-app-pdump-fix-build-with-clang.patch=092020-02-14 17:02:37.0624056= 22 +0000 @@ -1 +1 @@ -From ab30f26aaaa025121bdf804152ade031ce9d7c0a Mon Sep 17 00:00:00 2001 +From 3cfe805b2d4eb746de9e940e6a922ad85a8c0bc7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ab30f26aaaa025121bdf804152ade031ce9d7c0a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 903d02f482..d05a023667 100644 +index ccf2a1d2f7..3f1bed89ff 100644 @@ -24 +25 @@ -@@ -596,5 +596,5 @@ configure_vdev(uint16_t port_id) +@@ -557,5 +557,5 @@ configure_vdev(uint16_t port_id)