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 
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2017-12-05 10:44:19 -05:00
parent a3fde2addd 2391f0b480
commit 7cda4cee13
441 changed files with 3245 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/tipc/udp_media.c
View File

@@ -371,10 +371,6 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb)
goto rcu_out;
}
tipc_rcv(sock_net(sk), skb, b);
rcu_read_unlock();
return 0;
rcu_out:
rcu_read_unlock();
out: