Merge branch 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

Long Li says:

====================
Introduce Microsoft Azure Network Adapter (MANA) RDMA driver [netdev prep]

The first 11 patches which modify the MANA Ethernet driver to support
RDMA driver.

* 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  net: mana: Define data structures for protection domain and memory registration
  net: mana: Define data structures for allocating doorbell page from GDMA
  net: mana: Define and process GDMA response code GDMA_STATUS_MORE_ENTRIES
  net: mana: Define max values for SGL entries
  net: mana: Move header files to a common location
  net: mana: Record port number in netdev
  net: mana: Export Work Queue functions for use by RDMA driver
  net: mana: Set the DMA device max segment size
  net: mana: Handle vport sharing between devices
  net: mana: Record the physical address for doorbell page region
  net: mana: Add support for auxiliary device
====================

Link: https://lore.kernel.org/all/1667502990-2559-1-git-send-email-longli@linuxonhyperv.com/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_ethtool.c
Simple merge

diff --cc include/net/mana/gdma.h
index db340f3,221adc9..28d0687
--- 1/drivers/net/ethernet/microsoft/mana/gdma.h
--- 2/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@@ -352,8 -367,8 +367,9 @@@ struct gdma_context 
        void __iomem            *bar0_va;
        void __iomem            *shm_base;
        void __iomem            *db_page_base;
+       phys_addr_t             phys_db_page_base;
        u32 db_page_size;
 +      int                     numa_node;
  
        /* Shared memory chanenl (used to bootstrap HWC) */
        struct shm_channel      shm_channel;

diff --cc include/net/mana/mana.h
Simple merge