patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: John McNamara <john.mcnamara@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' has been queued to LTS release 18.11.11
Date: Thu,  5 Nov 2020 12:39:49 +0000	[thread overview]
Message-ID: <20201105124015.306404-42-ktraynor@redhat.com> (raw)
In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com>

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/fb7bce81c5dbb7366764588d25130ac3f88a6f6c

Thanks.

Kevin.

---
From fb7bce81c5dbb7366764588d25130ac3f88a6f6c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 3 Sep 2020 15:00:33 +0100
Subject: [PATCH] doc: fix formatting of notes in meson guide

[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]

The "note" callouts in the chapter describing the meson build were
incorrectly formatted, so adjust to use the correct markdown syntax.

Fixes: 9c3adc289c5e ("doc: add instructions on build using meson")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/build-sdk-meson.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 29a8bd387f..057734795e 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -98,9 +98,11 @@ Examples of setting the same options using meson configure::
 	meson configure -Dmax_lcores=8
 
-NOTE: once meson has been run to configure a build in a directory, it
-cannot be run again on the same directory. Instead ``meson configure``
-should be used to change the build settings within the directory, and when
-``ninja`` is called to do the build itself, it will trigger the necessary
-re-scan from meson.
+.. note::
+
+        once meson has been run to configure a build in a directory, it
+        cannot be run again on the same directory. Instead ``meson configure``
+        should be used to change the build settings within the directory, and when
+        ``ninja`` is called to do the build itself, it will trigger the necessary
+        re-scan from meson.
 
 As well as those settings taken from ``meson configure``, other options
@@ -110,7 +112,9 @@ example::
 	CC=clang meson clang-build
 
-NOTE: for more comprehensive overriding of compilers or other environment
-settings, the tools for cross-compilation may be considered. However, for
-basic overriding of the compiler etc., the above form works as expected.
+.. note::
+
+        for more comprehensive overriding of compilers or other environment
+        settings, the tools for cross-compilation may be considered. However, for
+        basic overriding of the compiler etc., the above form works as expected.
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.057244546 +0000
+++ 0042-doc-fix-formatting-of-notes-in-meson-guide.patch	2020-11-05 12:38:54.242896021 +0000
@@ -1 +1 @@
-From 1509ef9350671ee13381ce8e3c1741c2effc28b1 Mon Sep 17 00:00:00 2001
+From fb7bce81c5dbb7366764588d25130ac3f88a6f6c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,2 +16,2 @@
- doc/guides/prog_guide/build-sdk-meson.rst | 25 ++++++++++++++---------
- 1 file changed, 15 insertions(+), 10 deletions(-)
+ doc/build-sdk-meson.txt | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
@@ -18,6 +19,6 @@
-diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
-index 44d1cafdf0..d621bea565 100644
---- a/doc/guides/prog_guide/build-sdk-meson.rst
-+++ b/doc/guides/prog_guide/build-sdk-meson.rst
-@@ -103,12 +103,15 @@ Examples of setting some of the same options using meson configure::
- 	meson configure -Denable_trace_fp=true
+diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
+index 29a8bd387f..057734795e 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
+@@ -98,9 +98,11 @@ Examples of setting the same options using meson configure::
+ 	meson configure -Dmax_lcores=8
@@ -31,3 +32 @@
- 
--NOTE: machine=default uses a config that works on all supported architectures
--regardless of the capabilities of the machine where the build is happening.
++
@@ -39,4 +37,0 @@
-+
-+.. note::
-+        machine=default uses a config that works on all supported architectures
-+        regardless of the capabilities of the machine where the build is happening.
@@ -45 +40 @@
-@@ -118,7 +121,9 @@ example::
+@@ -110,7 +112,9 @@ example::


  parent reply	other threads:[~2020-11-05 12:41 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix stale value after free' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: remove unused log macros' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/iavf: downgrade error log' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'ethdev: remove redundant license text' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix function header arguments' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/tap: free mempool when closing' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/nfp: expand device info get' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
2020-11-05 13:22   ` David Marchand
2020-11-11 10:44     ` Kevin Traynor
2020-11-11 10:50       ` Kevin Traynor
2020-11-11 11:51         ` Luca Boccassi
2020-11-05 12:39 ` [dpdk-stable] patch 'gso: fix payload unit size for UDP' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: specify delay operations' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: fix release of wait event' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e: fix byte counters' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix shift operation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix queue get info' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix descriptor id check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix dereference before null check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app: fix ethdev port id size' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vfio: fix group descriptor check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' " Kevin Traynor
2020-11-05 12:39 ` Kevin Traynor [this message]
2020-11-05 12:39 ` [dpdk-stable] patch 'mem: fix allocation in container with SELinux' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/fslmc: fix dpio close' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: reset test statistics' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'port: remove useless assignment' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'pmdinfogen: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix getting link details' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/virtio: check raw checksum failure' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'table: fix hash for 32-bit' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix device number' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix stats test' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'cryptodev: fix parameter parsing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' " 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=20201105124015.306404-42-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=bruce.richardson@intel.com \
    --cc=john.mcnamara@intel.com \
    --cc=stable@dpdk.org \
    /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).