diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-13 00:38:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-13 00:38:46 -0400 |
| commit | d864991b220b7c62e81d21209e1fd978fd67352c (patch) | |
| tree | b570a1ad6fc1b959c5bcda6ceca0b321319c01e0 /net/ipv4/udp.c | |
| parent | a688c53a0277d8ea21d86a5c56884892e3442c5e (diff) | |
| parent | bab5c80b211035739997ebd361a679fa85b39465 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 1bec2203d558..cf8252d05a01 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -1627,7 +1627,7 @@ busy_check: | |||
| 1627 | *err = error; | 1627 | *err = error; |
| 1628 | return NULL; | 1628 | return NULL; |
| 1629 | } | 1629 | } |
| 1630 | EXPORT_SYMBOL_GPL(__skb_recv_udp); | 1630 | EXPORT_SYMBOL(__skb_recv_udp); |
| 1631 | 1631 | ||
| 1632 | /* | 1632 | /* |
| 1633 | * This should be easy, if there is something there we | 1633 | * This should be easy, if there is something there we |