projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c518471 cfcf99f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Apr 2017 19:42:11 +0000 (15:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Apr 2017 19:42:11 +0000 (15:42 -0400)
commit5577e679564702664aaecce3c96036ace3ab64fa
tree2e2538f37afc9b38a4e83d63e757ddf0d76dc425tree | snapshot
parentc51847171162212618b3227812f007a654de2f4bcommit | diff
parentcfcf99f987ba321a3d122580716beb9b08d52eb8commit | diff
Merge branch 'master' of git://git./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>
John Crispins staging tree