patch 'net/mana: enable driver by default' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/62324129c14d18fdb88b2a2af51ab1ce7ad704c7

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 62324129c14d18fdb88b2a2af51ab1ce7ad704c7 Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Thu, 19 Jan 2023 18:19:27 -0800
Subject: [PATCH] net/mana: enable driver by default
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 807440416cd9eddf571954c7fd355c0b48fa9f14 ]

The required dependencies for mana from rdma-core 44
and Linux kernel 6.2 have been released.

Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment")

Signed-off-by: Long Li <longli at microsoft.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 MAINTAINERS              | 2 +-
 doc/guides/nics/mana.rst | 8 +++-----
 drivers/net/meson.build  | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 22ef2ea4b9..1338ca00ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -850,7 +850,7 @@ F: buildtools/options-ibverbs-static.sh
 F: doc/guides/nics/mlx5.rst
 F: doc/guides/nics/features/mlx5.ini
 
-Microsoft mana - EXPERIMENTAL
+Microsoft mana
 M: Long Li <longli at microsoft.com>
 F: drivers/net/mana/
 F: doc/guides/nics/mana.rst
diff --git a/doc/guides/nics/mana.rst b/doc/guides/nics/mana.rst
index 005c0b2ca7..341146c4e7 100644
--- a/doc/guides/nics/mana.rst
+++ b/doc/guides/nics/mana.rst
@@ -29,6 +29,7 @@ and must be installed separately:
   It allows slow and privileged operations
   (context initialization, hardware resources allocations)
   to be managed by the kernel and fast operations to never leave user space.
+  The minimum required rdma-core version is v44.
 
   In most cases, rdma-core is shipped as a package with an OS distribution.
   User can also install the upstream version of the rdma-core from
@@ -39,15 +40,14 @@ and must be installed separately:
   Low-level user space driver library
   for Microsoft Azure Network Adapter devices,
   it is automatically loaded by libibverbs.
-
-  The support of MANA is not merged in rdma-core 42.
+  The minimum required version of rdma-core with libmana is v44.
 
 - **Kernel modules**
 
   They provide the kernel-side verbs API and low level device drivers
   that manage actual hardware initialization
   and resources sharing with user space processes.
-  The minimum required Linux kernel version is 6.1.
+  The minimum required Linux kernel version is 6.2.
 
   Unlike most other PMDs, these modules must remain loaded
   and bound to their devices:
@@ -56,8 +56,6 @@ and must be installed separately:
   - mana_ib: InifiniBand device driver.
   - ib_uverbs: user space driver for verbs (entry point for libibverbs).
 
-  The support of MANA is planned in Linux 6.2.
-
 Driver compilation and testing
 ------------------------------
 
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 6470bf3636..f83a6de117 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -36,6 +36,7 @@ drivers = [
         'ixgbe',
         'kni',
         'liquidio',
+        'mana',
         'memif',
         'mlx4',
         'mlx5',
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:39.599469800 +0800
+++ 0031-net-mana-enable-driver-by-default.patch	2023-04-09 21:45:38.609042200 +0800
@@ -1 +1 @@
-From 807440416cd9eddf571954c7fd355c0b48fa9f14 Mon Sep 17 00:00:00 2001
+From 62324129c14d18fdb88b2a2af51ab1ce7ad704c7 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 807440416cd9eddf571954c7fd355c0b48fa9f14 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 3495946d0f..ffbf91296e 100644
+index 22ef2ea4b9..1338ca00ba 100644
@@ -24 +26 @@
-@@ -853,7 +853,7 @@ F: buildtools/options-ibverbs-static.sh
+@@ -850,7 +850,7 @@ F: buildtools/options-ibverbs-static.sh