xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflict resolution of af_smc.c from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-04-17 11:26:25 -07:00
parent cea0aa9cbd fe5cdef29e
commit 6b0a7f84ea
350 changed files with 3837 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/smc/smc_pnet.c
View File

@@ -604,7 +604,8 @@ static int smc_pnet_flush(struct sk_buff *skb, struct genl_info *info)
{
struct net *net = genl_info_net(info);
return smc_pnet_remove_by_pnetid(net, NULL);
smc_pnet_remove_by_pnetid(net, NULL);
return 0;
}
/* SMC_PNETID generic netlink operation definition */