Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

diff --cc include/linux/skbuff.h
Simple merge

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

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

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