diff options
| author | David S. Miller <[email protected]> | 2014-03-26 00:29:20 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-03-26 00:29:20 +0000 |
| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e (patch) | |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca /security/capability.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-04f58c88542b6b351efb4eea01134eb672e22e6e.tar.gz kernel-04f58c88542b6b351efb4eea01134eb672e22e6e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c
The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.
In micrel-ks8851.txt we simply have overlapping changes.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index 8b4f24ae4338..21e2b9cae685 100644 --- a/security/capability.c +++ b/security/capability.c @@ -757,7 +757,8 @@ static void cap_skb_owned_by(struct sk_buff *skb, struct sock *sk) #ifdef CONFIG_SECURITY_NETWORK_XFRM static int cap_xfrm_policy_alloc_security(struct xfrm_sec_ctx **ctxp, - struct xfrm_user_sec_ctx *sec_ctx) + struct xfrm_user_sec_ctx *sec_ctx, + gfp_t gfp) { return 0; } |