Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

Change-Id: I44dc2744898ca59ad15cd77b49ad84da0220250a

diff --cc include/net/ip6_route.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/uapi/linux/rtnetlink.h
Simple merge

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

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

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

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

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

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

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

diff --cc net/ipv6/datagram.c
index 183ff87,b0fa0dc..cf2dfb2
--- 1/net/ipv6/datagram.c
--- 2/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@@ -161,11 -161,8 +161,11 @@@ ipv4_connected
        fl6.flowi6_mark = sk->sk_mark;
        fl6.fl6_dport = inet->inet_dport;
        fl6.fl6_sport = inet->inet_sport;
-       fl6.flowi6_uid = sock_i_uid(sk);
+       fl6.flowi6_uid = sk->sk_uid;
  
 +      if (!fl6.flowi6_oif)
 +              fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 +
        if (!fl6.flowi6_oif && (addr_type&IPV6_ADDR_MULTICAST))
                fl6.flowi6_oif = np->mcast_oif;
  

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

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/socket.c
Simple merge