patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Holly Nichols <hollynichols04@gmail.com>
Cc: Vinh Tran <vinh.t.tran10@gmail.com>,
	Thomas Monjalon <thomas@monjalon.net>,
	dpdk stable <stable@dpdk.org>
Subject: patch 'test/cfgfile: fix typo in error messages' has been queued to stable release 21.11.7
Date: Thu,  4 Apr 2024 10:51:49 +0100	[thread overview]
Message-ID: <20240404095155.155427-19-ktraynor@redhat.com> (raw)
In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 21.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 04/09/24. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/c6ab7f724167b5530314e2607312aa3d056f8b9d

Thanks.

Kevin

---
From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
From: Holly Nichols <hollynichols04@gmail.com>
Date: Thu, 21 Mar 2024 19:05:29 -0400
Subject: [PATCH] test/cfgfile: fix typo in error messages

[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]

Caught by codespell.

Fixes: c54e7234bc9e ("test/cfgfile: add basic unit tests")

Signed-off-by: Holly Nichols <hollynichols04@gmail.com>
Signed-off-by: Vinh Tran <vinh.t.tran10@gmail.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 .mailmap                | 2 ++
 app/test/test_cfgfile.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3851a80bbf..055e44f239 100644
--- a/.mailmap
+++ b/.mailmap
@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
 Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
 Hiroyuki Mikita <h.mikita89@gmail.com>
+Holly Nichols <hollynichols04@gmail.com>
 Hongbo Zheng <zhenghongbo3@huawei.com>
 Hongjun Ni <hongjun.ni@intel.com>
@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin@6wind.com>
 Vincent Li <vincent.mc.li@gmail.com>
 Vincent S. Cojot <vcojot@redhat.com>
+Vinh Tran <vinh.t.tran10@gmail.com>
 Vipin Varghese <vipin.varghese@amd.com> <vipin.varghese@intel.com>
 Vipul Ashri <vipul.ashri@oracle.com>
diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c
index 2f596affee..a5e3d8699c 100644
--- a/app/test/test_cfgfile.c
+++ b/app/test/test_cfgfile.c
@@ -169,5 +169,5 @@ test_cfgfile_invalid_section_header(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -186,5 +186,5 @@ test_cfgfile_invalid_comment(void)
 	cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0,
 					       &params);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -197,5 +197,5 @@ test_cfgfile_invalid_key_value_pair(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -237,5 +237,5 @@ test_cfgfile_missing_section(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.483347668 +0100
+++ 0019-test-cfgfile-fix-typo-in-error-messages.patch	2024-04-04 10:49:33.765457777 +0100
@@ -1 +1 @@
-From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001
+From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 6bb0855236..f3a25a7402 100644
+index 3851a80bbf..055e44f239 100644
@@ -23 +24 @@
-@@ -529,4 +529,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
+@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
@@ -29 +30 @@
-@@ -1514,4 +1515,5 @@ Vincent Jardin <vincent.jardin@6wind.com>
+@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin@6wind.com>


  parent reply	other threads:[~2024-04-04  9:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-04  9:51 patch 'net/hns3: enable PFC for all user priorities' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: add traffic manager in features table' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: add link speeds configuration " Kevin Traynor
2024-04-04  9:51 ` patch 'net/ena/base: limit exponential backoff' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/ena/base: restructure interrupt handling' " Kevin Traynor
2024-04-04  9:51 ` patch 'app/testpmd: fix --stats-period option check' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/hns3: support new device' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: update link to Windows DevX in mlx5 guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: prevent ioctl failure log flooding' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix age position in hairpin split' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix drop action release timing' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix warning about copy length' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/bnxt: fix number of Tx queues being created' " Kevin Traynor
2024-04-04 13:52   ` Kishore Padmanabha
2024-04-04  9:51 ` patch 'doc: fix default IP fragments maximum in programmer guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: fix typo in profiling guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: fix typo in packet framework " Kevin Traynor
2024-04-04  9:51 ` patch 'test/power: fix typo in error message' " Kevin Traynor
2024-04-04  9:51 ` Kevin Traynor [this message]
2024-04-04  9:51 ` patch 'examples/ipsec-secgw: " Kevin Traynor
2024-04-04  9:51 ` patch 'net/nfp: fix resource leak for PF initialization' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240404095155.155427-19-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=hollynichols04@gmail.com \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    --cc=vinh.t.tran10@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).