Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Sat, 24 Sep 2016 12:18:19 +0000 (08:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Sep 2016 12:18:19 +0000 (08:18 -0400)
commit1678c1134fd4aa26ae498a31b1b90c6401da9af8
treebd0f27c87a95193b99da0bd9bf67b5b257741f5b
parent834d9649808b1e2bdf6f6a2dec07b7812f78ea1c
parentc2f672fc94642bae96821a393f342edcfa9794a6
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2016-09-23

Only two patches this time:

1) Fix a comment reference to struct xfrm_replay_state_esn.
   From Richard Guy Briggs.

2) Convert xfrm_state_lookup to rcu, we don't need the
   xfrm_state_lock anymore in the input path.
   From Florian Westphal.

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

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