Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android...

Conflicts:
	arch/arm64/include/asm/cmpxchg.h
	drivers/cpufreq/cpufreq.c
	include/net/tcp.h
	net/ipv4/ping.c
	net/ipv4/sysctl_net_ipv4.c
	net/netfilter/xt_qtaguid.c

diff --cc drivers/cpufreq/cpufreq_governor.c
Simple merge

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

diff --cc include/net/tcp.h
index a67601f2cb50102393e41f314faff8dc56d12d16,cfb55e14b25b5117e6ce959faf3e0a5ee2fae97f..c10bd7a334928341c8f70e623f3d08de426f99f3
--- 1/include/net/tcp.h
--- 2/include/net/tcp.h
+++ b/include/net/tcp.h
@@@ -287,7 -287,7 +287,8 @@@ extern int sysctl_tcp_thin_dupack
  extern int sysctl_tcp_early_retrans;
  extern int sysctl_tcp_limit_output_bytes;
  extern int sysctl_tcp_challenge_ack_limit;
 +extern int sysctl_tcp_min_tso_segs;
+ extern int sysctl_tcp_default_init_rwnd;
  
  extern atomic_long_t tcp_memory_allocated;
  extern struct percpu_counter tcp_sockets_allocated;

diff --cc net/ipv4/ping.c
index 8cae28f5c3cf000e75c158551140010dc0e9e65f,edd6e74cad3550d8869b6b232175a7ce71b3c1c5..b0891b877fca24bfa578c959c023b025ca2bd555
--- 1/net/ipv4/ping.c
--- 2/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@@ -622,10 -822,13 +822,13 @@@ do_confirm
        goto out;
  }
  
- static int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                       size_t len, int noblock, int flags, int *addr_len)
+ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+                size_t len, int noblock, int flags, int *addr_len)
  {
        struct inet_sock *isk = inet_sk(sk);
 -      struct sockaddr_in *sin;
 -      struct sockaddr_in6 *sin6;
+       int family = sk->sk_family;
++        struct sockaddr_in *sin;
++        struct sockaddr_in6 *sin6;
        struct sk_buff *skb;
        int copied, err;
  
@@@ -635,8 -838,22 +838,22 @@@
        if (flags & MSG_OOB)
                goto out;
  
-       if (flags & MSG_ERRQUEUE)
-               return ip_recv_error(sk, msg, len, addr_len);
 -      if (addr_len) {
 -              if (family == AF_INET)
 -                      *addr_len = sizeof(*sin);
 -              else if (family == AF_INET6 && addr_len)
 -                      *addr_len = sizeof(*sin6);
 -      }
++        if (addr_len) {
++                if (family == AF_INET)
++                        *addr_len = sizeof(*sin);
++                else if (family == AF_INET6 && addr_len)
++                        *addr_len = sizeof(*sin6);
++        }
+ 
+       if (flags & MSG_ERRQUEUE) {
+               if (family == AF_INET) {
 -                      return ip_recv_error(sk, msg, len);
++                      return ip_recv_error(sk, msg, len, addr_len);
+ #if IS_ENABLED(CONFIG_IPV6)
+               } else if (family == AF_INET6) {
+                       return pingv6_ops.ipv6_recv_error(sk, msg, len);
+ #endif
+               }
+       }
  
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)

diff --cc net/ipv4/sysctl_net_ipv4.c
index 90b26beb84d41c614767d77188d0f3426e9a9658,f9bb5d7488e0d3d8599efecb5db1b9386cbb25f9..4fca1aa4c50510f96cfc4a92f2b2c9fcb39f4f4f
--- 1/net/ipv4/sysctl_net_ipv4.c
--- 2/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -753,15 -763,13 +768,22 @@@ static struct ctl_table ipv4_table[] = 
                .extra1         = &zero,
                .extra2         = &four,
        },
 +      {
 +              .procname       = "tcp_min_tso_segs",
 +              .data           = &sysctl_tcp_min_tso_segs,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec_minmax,
 +              .extra1         = &zero,
 +              .extra2         = &gso_max_segs,
 +      },
+       {
+               .procname       = "tcp_default_init_rwnd",
+               .data           = &sysctl_tcp_default_init_rwnd,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_tcp_default_init_rwnd
+       },
        {
                .procname       = "udp_mem",
                .data           = &sysctl_udp_mem,

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

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

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

diff --cc net/netfilter/xt_qtaguid.c
Simple merge