diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-10-31 14:48:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 14:48:31 -0700 |
| commit | 44715423dd018e01ff31b73b130d362e95a6c59c (patch) | |
| tree | 5b80599d98d8900762647e03f65380682af55675 /net/unix/af_unix.c | |
| parent | Merge branch 'net-dsa-replace-routing-tables-with-a-list' (diff) | |
| parent | bnxt_en: Call bnxt_ulp_stop()/bnxt_ulp_start() during suspend/resume. (diff) | |
| download | linux-dev-44715423dd018e01ff31b73b130d362e95a6c59c.tar.xz linux-dev-44715423dd018e01ff31b73b130d362e95a6c59c.zip | |
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>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions