From: David S. Miller <davem@davemloft.net>
Date: Thu, 31 Oct 2019 21:48:31 +0000 (-0700)
Subject: Merge branch 'bnxt_en-Updates-for-net-next'
X-Git-Tag: v5.5-rc1~174^2~254
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=44715423dd018e01ff31b73b130d362e95a6c59c;p=linux.git

Merge branch 'bnxt_en-Updates-for-net-next'

Michael Chan says:

====================
bnxt_en: Updates for net-next.

This patch series adds TC Flower tunnel decap and rewrite actions in
the first 4 patches.  The next 3 patches integrates the recently
added error recovery with the RDMA driver by calling the proper
hooks to stop and start.

v2: Fix pointer alignment issue in patch #1.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

44715423dd018e01ff31b73b130d362e95a6c59c