Merge tag 'v3.10.81' into update
authorStricted <info@stricted.net>
Wed, 21 Mar 2018 21:45:35 +0000 (22:45 +0100)
committerStricted <info@stricted.net>
Wed, 21 Mar 2018 21:45:35 +0000 (22:45 +0100)
This is the 3.10.81 stable release

1  2 
Makefile
block/genhd.c
net/ipv4/route.c
net/unix/af_unix.c

diff --cc Makefile
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
index 9b13da4e644d487f2475d4313563f73ddef47646,123c16419cbe91581fb5435ce39c9436d3c5a2e6..8ccc661efa5304978a559f8b9b7c5c7e4a302dba
@@@ -2122,8 -1896,12 +2122,12 @@@ static long unix_stream_data_wait(struc
  
                set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
                unix_state_unlock(sk);
 -              timeo = schedule_timeout(timeo);
 +              timeo = freezable_schedule_timeout(timeo);
                unix_state_lock(sk);
+               if (sock_flag(sk, SOCK_DEAD))
+                       break;
                clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
        }