From: David S. Miller Date: Wed, 27 Mar 2013 18:07:04 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: firefly_0821_release~3680^2~810^2~22 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fb031f036385af1e1de87ac3e98a2afba2139ae;p=firefly-linux-kernel-4.4.55.git Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== 1) Initialize the satype field in key_notify_policy_flush(), this was left uninitialized. From Nicolas Dichtel. 2) The sequence number difference for replay notifications was misscalculated on ESN sequence number wrap. We need a separate replay notify function for esn. 3) Fix an off by one in the esn replay notify function. From Mathias Krause. ==================== Signed-off-by: David S. Miller --- 0fb031f036385af1e1de87ac3e98a2afba2139ae