]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71113e2 c039b2f)
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)
commit2775d6236d338eabbbfe03f1b18433101e7ab39e
tree2e2538f37afc9b38a4e83d63e757ddf0d76dc425tree | snapshot
parent71113e21bcf16f6ea520356f60244b7e907ccb3acommit | diff
parentc039b2f216cae2a76aaf409405e6e1f669d6f8d8commit | 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>
Linux Kernel Source Tree.