diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-28 15:42:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-28 15:42:11 -0400 |
| commit | 5577e679564702664aaecce3c96036ace3ab64fa (patch) | |
| tree | 2e2538f37afc9b38a4e83d63e757ddf0d76dc425 /drivers | |
| parent | c51847171162212618b3227812f007a654de2f4b (diff) | |
| parent | cfcf99f987ba321a3d122580716beb9b08d52eb8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2017-04-28
1) Do garbage collecting after a policy flush to remove old
bundles immediately. From Xin Long.
2) Fix GRO if netfilter is not defined.
From Sabrina Dubroca.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions