From: David S. Miller <davem@davemloft.net>
Date: Sat, 24 Sep 2016 12:18:19 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v4.9-rc1~127^2~78
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1678c1134fd4aa26ae498a31b1b90c6401da9af8;p=karo-tx-linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/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>
---

1678c1134fd4aa26ae498a31b1b90c6401da9af8