projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b085f31 52a4c64)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2014 16:42:33 +0000 (12:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2014 16:42:33 +0000 (12:42 -0400)
commit72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f
tree36ffd7b181a7b72fe02015014086001e440a043dtree | snapshot (tar.gz zip)
parentb085f311e85b1d6f75d610097c2f20583b776fdacommit | diff
parent52a4c6404f91f2d2c5592ee6365a8418c4565f53commit | diff
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>