[dpdk-stable] patch 'ethdev: fix doxygen comment to be with structure' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From ee656c737d94393be101873305ea24754df8adf9 Mon Sep 17 00:00:00 2001
From: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Date: Tue, 25 Sep 2018 15:31:09 +0100
Subject: [PATCH] ethdev: fix doxygen comment to be with structure

[ upstream commit cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d ]

The doxygen comment describing the rte_eth_dev_info structure
was separated from the structure itself so move the comment
back to be with the structure.

Fixes: 7238e63bce52 ("ethdev: add support for device offload capabilities")

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 lib/librte_ethdev/rte_ethdev.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index fa2812bca..f3c0d1928 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -870,10 +870,4 @@ struct rte_eth_conf {
 };
 
-/**
- * A structure used to retrieve the contextual information of
- * an Ethernet device, such as the controlling driver of the device,
- * its PCI context, etc...
- */
-
 /**
  * RX offload capabilities of a device.
@@ -1011,4 +1005,10 @@ struct rte_eth_switch_info {
  * Ethernet device information
  */
+
+/**
+ * A structure used to retrieve the contextual information of
+ * an Ethernet device, such as the controlling driver of the
+ * device, etc...
+ */
 struct rte_eth_dev_info {
 	struct rte_device *device; /** Generic device information */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:14.463637731 +0000
+++ 0033-ethdev-fix-doxygen-comment-to-be-with-structure.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,14 +1,15 @@
-From cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d Mon Sep 17 00:00:00 2001
+From ee656c737d94393be101873305ea24754df8adf9 Mon Sep 17 00:00:00 2001
 From: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
 Date: Tue, 25 Sep 2018 15:31:09 +0100
 Subject: [PATCH] ethdev: fix doxygen comment to be with structure
 
+[ upstream commit cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d ]
+
 The doxygen comment describing the rte_eth_dev_info structure
 was separated from the structure itself so move the comment
 back to be with the structure.
 
 Fixes: 7238e63bce52 ("ethdev: add support for device offload capabilities")
-Cc: stable at dpdk.org
 
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
 Acked-by: Thomas Monjalon <thomas at monjalon.net>
@@ -17,7 +18,7 @@
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
-index 44b4fb33f..012577b0a 100644
+index fa2812bca..f3c0d1928 100644
 --- a/lib/librte_ethdev/rte_ethdev.h
 +++ b/lib/librte_ethdev/rte_ethdev.h
 @@ -870,10 +870,4 @@ struct rte_eth_conf {
@@ -31,7 +32,7 @@
 -
  /**
   * RX offload capabilities of a device.
-@@ -1006,4 +1000,10 @@ struct rte_eth_switch_info {
+@@ -1011,4 +1005,10 @@ struct rte_eth_switch_info {
   * Ethernet device information
   */
 +