diff options
| author | Jakub Kicinski | 2020-10-12 15:00:36 -0700 |
|---|---|---|
| committer | Jakub Kicinski | 2020-10-12 15:00:36 -0700 |
| commit | a308283fdbf712b30061d2b4567530eb9e8dc1b4 (patch) | |
| tree | 87b1477a7d57f6b0c3f189ecfb1e0923b4c1f413 /net/hsr | |
| parent | 547848af58e3eb5a0d8b0a5e6433042f111788e2 (diff) | |
| parent | 793d5d61242695142460ce74f124281e0681fbc7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for net-next:
1) Inspect the reply packets coming from DR/TUN and refresh connection
state and timeout, from longguang yue and Julian Anastasov.
2) Series to add support for the inet ingress chain type in nf_tables.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/hsr')
0 files changed, 0 insertions, 0 deletions