| commit | 44715423dd018e01ff31b73b130d362e95a6c59c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Oct 31 14:48:31 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Oct 31 14:48:31 2019 -0700 |
| tree | 5b80599d98d8900762647e03f65380682af55675 | |
| parent | e43ea83cc78604b4eb02d5917f50a8b8eb6c0c85 [diff] | |
| parent | 6a68749dbd777b832e1d84265bd6d8b39d1843ac [diff] |
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>