Merge branch topic/uek-4.1/uek-carry of git://ca-git.us.oracle.com/linux-uek into...

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/fou.c
Simple merge

diff --cc net/ipv4/gre_offload.c
Simple merge

diff --cc net/ipv6/ip6_offload.c
Simple merge