patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
Cc: David Hunt <david.hunt@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'doc: fix JSON interface for power sample' has been queued to LTS release 18.11.2
Date: Tue, 14 May 2019 15:44:06 +0100	[thread overview]
Message-ID: <20190514144406.7526-22-ktraynor@redhat.com> (raw)
In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/20/19. 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/d6678ae521f075639d7208e6c5bb1bc85b8976b0

Thanks.

Kevin Traynor

---
From d6678ae521f075639d7208e6c5bb1bc85b8976b0 Mon Sep 17 00:00:00 2001
From: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
Date: Mon, 13 May 2019 15:13:55 +0100
Subject: [PATCH] doc: fix JSON interface for power sample

[ upstream commit deb103d7abc5b160f4b4e5e8db554f5098aca84b ]

Updated doc for JSON sample code related to vm_power_manager
fifo interface: "command": "destroy", "command": "power".

There is no code change to go with this doc update, it is to fix
the docs to match the implementation in the code.

Fixes: a63504a90f ("examples/power: add JSON string handling")

Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 doc/guides/sample_app_ug/vm_power_management.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 57758ca00..a7b7a2c7b 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -593,5 +593,5 @@ Profile destroy example:
   .. code-block:: javascript
 
-    {"profile": {
+    {"policy": {
       "name": "ubuntu",
       "command": "destroy",
@@ -602,6 +602,7 @@ Power command example:
   .. code-block:: javascript
 
-    {"command": {
+    {"instruction": {
       "name": "ubuntu",
+      "command": "power",
       "unit": "SCALE_MAX",
       "resource_id": 10
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.369602120 +0100
+++ 0022-doc-fix-JSON-interface-for-power-sample.patch	2019-05-14 15:39:07.327558531 +0100
@@ -1 +1 @@
-From deb103d7abc5b160f4b4e5e8db554f5098aca84b Mon Sep 17 00:00:00 2001
+From d6678ae521f075639d7208e6c5bb1bc85b8976b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit deb103d7abc5b160f4b4e5e8db554f5098aca84b ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 109d10957..5d9a26172 100644
+index 57758ca00..a7b7a2c7b 100644
@@ -25 +26 @@
-@@ -598,5 +598,5 @@ Profile destroy example:
+@@ -593,5 +593,5 @@ Profile destroy example:
@@ -32 +33 @@
-@@ -607,6 +607,7 @@ Power command example:
+@@ -602,6 +602,7 @@ Power command example:

      parent reply	other threads:[~2019-05-14 14:45 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-14 14:43 [dpdk-stable] patch 'net/mlx5: fix Multi-Packet RQ mempool name' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'net/mlx5: fix release of Rx queue object' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'doc: fix typo in mlx5 guide' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'ipc: unlock on failure' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'doc: fix typo in IPC guide' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'ipc: add warnings about not using IPC with memory API' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'ipc: add warnings about correct API usage' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'power: fix cache line alignment' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'test/barrier: fix typo in log' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'test/barrier: fix allocation check' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'test/barrier: fix for Power CPUs' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'hash: fix position returned in free slots' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'hash: fix total entries count' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'examples/ipsec-secgw: fix build error log' " Kevin Traynor
2019-05-14 14:43 ` [dpdk-stable] patch 'devtools: fix symbol name in check " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'devtools: accept experimental symbol promotion' " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'devtools: fix check of symbol added as stable API' " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'doc: fix formatting in testpmd guide' " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'eventdev: fix Rx adapter event flush' " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'event/dsw: ignore scheduling type for single-link queues' " Kevin Traynor
2019-05-14 14:44 ` [dpdk-stable] patch 'app/testpmd: fix offload flags after port config' " Kevin Traynor
2019-05-14 14:44 ` Kevin Traynor [this message]

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=20190514144406.7526-22-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=david.hunt@intel.com \
    --cc=lukaszx.krakowiak@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).