Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:41:47 +0000 (14:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:41:47 +0000 (14:41 -0400)
commit9399bdcbb54b1e224a8532c01d496ada87e526bd
tree1fb76e1f36d16e2ce591d1146f20f8035405a23c
parent6fb8c381a6412981c05741d7d077c3f537eb5d14
parent74005991b78a0a7a6546004fb37d33a651c613e7
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2015-04-09

1) Prohibit the use/abuse of the xfrm netlink interface on
   32/64 bit compatibility tasks. We need a full compat
   layer before we can allow this. From Fan Du.

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

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