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 9AFCEA04A3 for ; Fri, 5 Jun 2020 20:27:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 921E31D515; Fri, 5 Jun 2020 20:27:15 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 48FD61D510 for ; Fri, 5 Jun 2020 20:27:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381632; 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=Gd/G4X/JqGEYGj8lL8Uk8S8ucTvIUP3OpEWwZP2B1Eo=; b=H1I+2jO8/I/MSw6aq+OZc70Wq32+xAP8ErYhPlk5WDBHoGJNOYPv/yZXYKQs7JPnn+rMlI bDPNfuJYmDP9I4FWlyl56jWG3CNP7qjNXbFTZ+/0n5NInNb/MTsMmB0sVa+XzOQVw++73z KbqW47zIHDne2CwtmAKzi8P+eyf/YKs= 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-254-ZLIUqMaVO4mkP0YSAc91Lg-1; Fri, 05 Jun 2020 14:27:09 -0400 X-MC-Unique: ZLIUqMaVO4mkP0YSAc91Lg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB9F58018A7; Fri, 5 Jun 2020 18:27:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEC7560C47; Fri, 5 Jun 2020 18:27:07 +0000 (UTC) From: Kevin Traynor To: Ivan Dyukov Cc: Andrew Rybchenko , dpdk stable Date: Fri, 5 Jun 2020 19:24:44 +0100 Message-Id: <20200605182525.22483-47-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app: remove extra new line after link duplex' has been queued to LTS release 18.11.9 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.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 06/10/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 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/8b1f81d77bd2ccb2479444dfdb49918d1be4e464 Thanks. Kevin. --- >From 8b1f81d77bd2ccb2479444dfdb49918d1be4e464 Mon Sep 17 00:00:00 2001 From: Ivan Dyukov Date: Thu, 7 May 2020 21:26:01 +0300 Subject: [PATCH] app: remove extra new line after link duplex [ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ] This is testpmd part of new line cleanup. Fixes: 002ade70e9 ("app/test: measure cycles per packet in Rx/Tx") Fixes: ce8d561418 ("app/testpmd: add port configuration settings") Signed-off-by: Ivan Dyukov Acked-by: Andrew Rybchenko --- app/test-pmd/testpmd.c | 2 +- test/test/test_pmd_perf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index a910c06dc2..b68bc54e32 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2501,5 +2501,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/test/test/test_pmd_perf.c b/test/test/test_pmd_perf.c index ed8524a176..d68f9599c7 100644 --- a/test/test/test_pmd_perf.c +++ b/test/test/test_pmd_perf.c @@ -143,5 +143,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); if (link_mbps == 0) link_mbps = link.link_speed; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.400205925 +0100 +++ 0047-app-remove-extra-new-line-after-link-duplex.patch 2020-06-05 19:20:50.830040359 +0100 @@ -1 +1 @@ -From a357d09d54246ea72625c22a970d81a3165fbf94 Mon Sep 17 00:00:00 2001 +From 8b1f81d77bd2ccb2479444dfdb49918d1be4e464 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - app/test-pmd/testpmd.c | 2 +- - app/test/test_pmd_perf.c | 2 +- + app/test-pmd/testpmd.c | 2 +- + test/test/test_pmd_perf.c | 2 +- @@ -20 +21 @@ -index 4b13bf6a98..9cbe6e9f68 100644 +index a910c06dc2..b68bc54e32 100644 @@ -23 +24 @@ -@@ -3013,5 +3013,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -2501,5 +2501,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -30,5 +31,5 @@ -diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c -index d61be58bb3..352cd47156 100644 ---- a/app/test/test_pmd_perf.c -+++ b/app/test/test_pmd_perf.c -@@ -152,5 +152,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) +diff --git a/test/test/test_pmd_perf.c b/test/test/test_pmd_perf.c +index ed8524a176..d68f9599c7 100644 +--- a/test/test/test_pmd_perf.c ++++ b/test/test/test_pmd_perf.c +@@ -143,5 +143,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)