Backported patches reqiring manual conflict resolution
for the bnxt PMD.

Lance Richardson (3):
  net/bnxt: fix Rx burst size constraint
  net/bnxt: fix ring and context memory allocation
  net/bnxt: fix missing barriers in completion handling

 drivers/net/bnxt/bnxt_cpr.h          | 40 ++++++++++++++++++++++------
 drivers/net/bnxt/bnxt_ethdev.c       | 18 ++++++-------
 drivers/net/bnxt/bnxt_irq.c          |  6 ++---
 drivers/net/bnxt/bnxt_ring.c         | 30 ++++++++++-----------
 drivers/net/bnxt/bnxt_ring.h         |  2 +-
 drivers/net/bnxt/bnxt_rxq.c          |  4 +--
 drivers/net/bnxt/bnxt_rxr.c          |  9 ++++---
 drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 40 +++++++++++++++++++++-------
 drivers/net/bnxt/bnxt_txq.c          |  4 +--
 drivers/net/bnxt/bnxt_txr.c          |  2 +-
 drivers/net/bnxt/bnxt_vnic.c         |  3 ++-
 11 files changed, 102 insertions(+), 56 deletions(-)

-- 
2.25.1