From: David S. Miller <davem@davemloft.net>
Date: Tue, 18 Mar 2014 16:42:33 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Tag: v3.14-rc8~3^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f;p=kernel%2Fkernel-generic.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
1) Fix a sleep in atomic when pfkey_sadb2xfrm_user_sec_ctx()
   is called from pfkey_compile_policy().
   Fix from Nikolay Aleksandrov.

2) security_xfrm_policy_alloc() can be called in process and atomic
   context. Add an argument to let the callers choose the appropriate
   way. Fix from Nikolay Aleksandrov.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f