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 A2C6BA04B1 for ; Thu, 5 Nov 2020 13:40:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 272D9C7E8; Thu, 5 Nov 2020 13:40:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 12DC1C31B for ; Thu, 5 Nov 2020 13:40:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580040; 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=c+elEI4EFa2ijDJ6D4SdzOnIyaYxh8efPip91Z6GeRA=; b=M2N55Sjgv69Ftrvl1sBb+V6Eb9huv3TwqZBPgOX4YeRLMjBdgUopy9Ydds3sq/fuiRkbib eIviWV1SH94vsv7dBHlP7J2Q6jrukvYmXy8jnU1XCgotNvTdWvHDNGsNFH0MqUXXNRG2D3 0Md7fYXYkJOENJTnvdhnYHfOgju6Mus= 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-396-8A87Wgn-NMmTtMURuZFS5g-1; Thu, 05 Nov 2020 07:40:36 -0500 X-MC-Unique: 8A87Wgn-NMmTtMURuZFS5g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B92281009E36; Thu, 5 Nov 2020 12:40:34 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id B501F5C5FD; Thu, 5 Nov 2020 12:40:33 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Gaetan Rivet , dpdk stable Date: Thu, 5 Nov 2020 12:39:09 +0000 Message-Id: <20201105124015.306404-2-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/failsafe: fix double space in warning log' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/ecd5ec5a59a512964333d91ebf474dbd578f656a Thanks. Kevin. --- >From ecd5ec5a59a512964333d91ebf474dbd578f656a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 14 Aug 2020 10:39:33 -0700 Subject: [PATCH] net/failsafe: fix double space in warning log [ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ] Already get a newline from WARN() macro call. Fixes: 9dda3e3393c2 ("net/failsafe: add timestamp to stats snapshot") Signed-off-by: Stephen Hemminger Acked-by: Gaetan Rivet --- drivers/net/failsafe/failsafe_ether.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c index 2ff234ea3a..3e1f65f09a 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev) uint64_t timestamp = sdev->stats_snapshot.timestamp; - WARN("Could not access latest statistics from sub-device %d.\n", + WARN("Could not access latest statistics from sub-device %d.", SUB_ID(sdev)); if (timestamp != 0) - WARN("Using latest snapshot taken before %"PRIu64" seconds.\n", + WARN("Using latest snapshot taken before %"PRIu64" seconds.", (rte_rdtsc() - timestamp) / rte_get_tsc_hz()); } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.313628296 +0000 +++ 0002-net-failsafe-fix-double-space-in-warning-log.patch 2020-11-05 12:38:54.136895939 +0000 @@ -1 +1 @@ -From 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd Mon Sep 17 00:00:00 2001 +From ecd5ec5a59a512964333d91ebf474dbd578f656a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2b748bd8b4..70972d6717 100644 +index 2ff234ea3a..3e1f65f09a 100644 @@ -21 +22 @@ -@@ -323,8 +323,8 @@ fs_dev_stats_save(struct sub_device *sdev) +@@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev)