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 
Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2018-10-12 21:38:46 -07:00
parent a688c53a02 bab5c80b21
commit d864991b22
161 changed files with 1420 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/udp.c
View File

@@ -1627,7 +1627,7 @@ busy_check:
*err = error;
return NULL;
}
EXPORT_SYMBOL_GPL(__skb_recv_udp);
EXPORT_SYMBOL(__skb_recv_udp);
/*
* This should be easy, if there is something there we