Merge tag 'v3.10.108' into update

This is the 3.10.108 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

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

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

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

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

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

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

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

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

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

diff --cc net/ipv4/tcp_input.c
index 094515e751d01c323f6600356cf072d0a723d457,85dd09be16182ad882b66a71e33541433dd2c2ea..41ef73a7cb66102f1923f44aa6a104da87eeaac0
--- 1/net/ipv4/tcp_input.c
--- 2/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@@ -3013,11 -2977,10 +3012,10 @@@ void tcp_rearm_rto(struct sock *sk
                        /* delta may not be positive if the socket is locked
                         * when the retrans timer fires and is rescheduled.
                         */
-                       if (delta > 0)
-                               rto = delta;
+                       rto = max_t(int, delta, 1);
                }
                inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,
 -                                        TCP_RTO_MAX);
 +                                        sysctl_tcp_rto_max);
        }
  }
  

diff --cc net/ipv4/tcp_output.c
index 77e6a9d36023ef9e97dc9536cb61d83b9da6d9a4,f5d670ccd403b3215d7a9ed49ea8b3d9ef8c08e6..f51287dac700d7088aa8a867cbb77ee9d4012890
--- 1/net/ipv4/tcp_output.c
--- 2/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -1986,17 -1975,13 +1974,13 @@@ bool tcp_schedule_loss_probe(struct soc
                                (rtt + (rtt >> 1) + TCP_DELACK_MAX));
        timeout = max_t(u32, timeout, msecs_to_jiffies(10));
  
-       /* If RTO is shorter, just schedule TLP in its place. */
-       tlp_time_stamp = tcp_time_stamp + timeout;
-       rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout;
-       if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) {
-               s32 delta = rto_time_stamp - tcp_time_stamp;
-               if (delta > 0)
-                       timeout = delta;
-       }
+       /* If the RTO formula yields an earlier time, then use that time. */
+       rto_delta = tcp_rto_delta(sk);  /* How far in future is RTO? */
+       if (rto_delta > 0)
+               timeout = min_t(u32, timeout, rto_delta);
  
        inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,
 -                                TCP_RTO_MAX);
 +                                sysctl_tcp_rto_max);
        return true;
  }
  

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

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

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

diff --cc net/wireless/nl80211.c
Simple merge