From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 38989A00E6 for ; Tue, 14 May 2019 16:45:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2DAFB5F22; Tue, 14 May 2019 16:45:23 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7798F5F27 for ; Tue, 14 May 2019 16:45:21 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 397E2307D941; Tue, 14 May 2019 14:45:17 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E4A4608AB; Tue, 14 May 2019 14:45:15 +0000 (UTC) From: Kevin Traynor To: Lukasz Krakowiak Cc: David Hunt , dpdk stable Date: Tue, 14 May 2019 15:44:06 +0100 Message-Id: <20190514144406.7526-22-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 14 May 2019 14:45:20 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix JSON interface for power sample' has been queued to LTS release 18.11.2 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.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 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 Acked-by: David Hunt --- 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: