Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Apr 2017 14:10:30 +0000 (10:10 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Apr 2017 14:10:30 +0000 (10:10 -0400)
commitc6606a87dbb67ef79fc129c81e161f7791a1f047
tree28f29d5b8533b716cca9eaac68386b465f025a00
parent7988ceefd744a3d4219233c364c9245b952bd9d4
parent6c786bcb29dd684533ec165057f437d5bb34a4b2
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-04-11

1) Remove unused field from struct xfrm_mgr.

2) Code size optimizations for the xfrm prefix hash and
   address match.

3) Branch optimization for addr4_match.

All patches from Alexey Dobriyan.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/xfrm/xfrm_user.c