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 64690A04DD for ; Wed, 28 Oct 2020 11:46:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8EFADCA10; Wed, 28 Oct 2020 11:46:18 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id BEDE2C9FC for ; Wed, 28 Oct 2020 11:46:16 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id y12so5131310wrp.6 for ; Wed, 28 Oct 2020 03:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AeF6hRoBkrfmZHyUsd5ZmUzAE95f+KOsoWlY6u1e240=; b=LVbqmyx+9iJb4763/ZvKwnl3Cq/QpzwKzueZP8QQFzlYJNykN+KEYiRdPLRnwY+8di OKE2UIggaUwU7Kspf7R6UHXxpmRAVWASLFbkE5m9beakY7wH3nFXJF5Luz/pHaLFbDWP oGqmtPCksqMfbfzEehw5PUiKyy+Dps7DCUogyFgPRRXmsw8yFIrj8iepQH4Z0lVvvNQx LMQI+yWsDB80JH1nojJiDfvJTM+FqG51UNiPKCC6WByzkT8fHvQ8CZgjl7aBY2PK2Sh9 QVAJSVYocB7CWFnv8g1VRvVFy+/uKjPsDrUh9hlFIUoIb+htjF8+20iqcI0l3ef25PuN FiFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AeF6hRoBkrfmZHyUsd5ZmUzAE95f+KOsoWlY6u1e240=; b=N2q7Pkb526k4yE7Td+Jck53YygZo3NROHJu4ddkUV57hVIQ0DiP1fX65jq3D7T2txu XMMpJ+V5yN2hfGVFElIWkSPL3pBd37ZUyn9ikno0gem4fN2nvBicGLy1XOPyYI4RiSPM axz6g3EFvUaOePBgknS76Ja7a3zpuXHJRY6DTcYFuuLY+rR2SSgct7Amwr4kw59BnAx8 3dX7vyite6j1l52ucgfZ84u0jgaACA8vcByOjXWWn4M91/6MY522vHFzUDhGHudzbX36 g5kRa+qrbA0MzW3/5OSm3tJhHc11V3o2/Gsj0BrgUqiFpAqLo/Dsbwq9rF4iEFEVEAYX VNAQ== X-Gm-Message-State: AOAM533jNwz0gRukU7YnBVTmpUfTfYrSzT1PDFmCZlh489SDm/vIMf7V 7VIgvV7mJ+IylC6gTg+CI+dE9rX6a/hPMg== X-Google-Smtp-Source: ABdhPJwT5VfuVo78e38ogU1XGFp3Abo7fLLKaguP++bqPe95zgD/g1i8ONLvrvVJ9k+xQ6Wj8AkGHw== X-Received: by 2002:adf:818b:: with SMTP id 11mr7911607wra.74.1603881975479; Wed, 28 Oct 2020 03:46:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g8sm6254609wma.36.2020.10.28.03.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Gaetan Rivet , dpdk stable Date: Wed, 28 Oct 2020 10:42:42 +0000 Message-Id: <20201028104606.3504127-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/failsafe: fix double space in warning log' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 73af0c03945b0524c5efac446a7f60c8c0c78e11 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 93deacd134..6c27645b96 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -322,10 +322,10 @@ fs_dev_stats_save(struct sub_device *sdev) if (err) { 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()); } failsafe_stats_increment -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:11.889741463 +0000 +++ 0003-net-failsafe-fix-double-space-in-warning-log.patch 2020-10-28 10:35:11.380828199 +0000 @@ -1,12 +1,13 @@ -From 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd Mon Sep 17 00:00:00 2001 +From 73af0c03945b0524c5efac446a7f60c8c0c78e11 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") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Gaetan Rivet @@ -15,7 +16,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c -index 2b748bd8b4..70972d6717 100644 +index 93deacd134..6c27645b96 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -322,10 +322,10 @@ fs_dev_stats_save(struct sub_device *sdev)