Merge tag 'v3.10.95' into update

This is the 3.10.95 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/core/hub.c
index 66c287e756ecf588143fd4b734029ac76bb73850,92873f2773fc6ff62a8744f538a1bc681b466b21..67c6d0d4ba0b6721401c0b04e56cd290dcfc86e1
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -4789,16 -4532,10 +4795,15 @@@ static void hub_port_connect_change(str
                }
  
                /* reset (non-USB 3.0 devices) and get descriptor */
 +              MYDBG("");
                status = hub_port_init(hub, udev, port1, i);
                if (status < 0)
 +              {
 +                      MYDBG("");
                        goto loop;
 +              }
 +              MYDBG("");
  
-               usb_detect_quirks(udev);
                if (udev->quirks & USB_QUIRK_DELAY_INIT)
                        msleep(1000);
  

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

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

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

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

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

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

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

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

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

diff --cc net/unix/af_unix.c
index 8db136a9d87b05ad1195402223028236f30326ce,f934e7ba5eb833c45098c59cb8bb440d9f50b52d..5bf16d9d43301b907ffb936e7e37ca06c8c82200
--- 1/net/unix/af_unix.c
--- 2/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -1622,7 -1574,7 +1622,11 @@@ static int unix_dgram_sendmsg(struct ki
        int max_level;
        int data_len = 0;
        int sk_locked;
++<<<<<<< HEAD
 +       
++=======
+ 
++>>>>>>> v3.10.95
        if (NULL == siocb->scm)
                siocb->scm = &tmp_scm;
        wait_for_unix_gc();
@@@ -1714,7 -1666,9 +1718,13 @@@ restart_locked
                sock_put(other);
  
                if (!sk_locked)
++<<<<<<< HEAD
 +              unix_state_lock(sk);
++=======
+                       unix_state_lock(sk);
+ 
+               err = 0;
++>>>>>>> v3.10.95
                if (unix_peer(sk) == other) {
                        unix_peer(sk) = NULL;
                        unix_dgram_peer_wake_disconnect_wakeup(sk, other);
@@@ -1744,12 -1698,7 +1754,16 @@@
                        goto out_unlock;
        }
  
++<<<<<<< HEAD
 +      /* other == sk && unix_peer(other) != sk if
 +       * - unix_peer(sk) == NULL, destination address bound to sk
 +       * - unix_peer(sk) == sk by time of get but disconnected before lock
 +       */
 +      if (other != sk &&
 +          unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
++=======
+       if (unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
++>>>>>>> v3.10.95
                if (timeo) {
                        timeo = unix_wait_for_peer(other, timeo);
  
@@@ -2235,31 -2125,8 +2242,30 @@@ again
                        mutex_unlock(&u->readlock);
  
                        timeo = unix_stream_data_wait(sk, timeo, last);
 +                        if (!timeo)
 +                        {
 +                            if(sk && sk->sk_socket )
 +                            {
 +                                if(other && other->sk_socket ){
 +                                      #ifdef CONFIG_MTK_NET_LOGGING 
 +                     printk(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:%lu]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
 +                                 #endif
 +                                 }else{                                  
 +                                      #ifdef CONFIG_MTK_NET_LOGGING                              
 +                     printk(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:null]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino);
 +                     #endif
 +                                  }                     
 +                         }
 +                         else 
 +                                      {
 +                                              #ifdef CONFIG_MTK_NET_LOGGING   
 +                                printk(KERN_INFO " [mtk_net][unix]: recvmsg:exit read due to timeout \n" );
 +                                #endif
 +                              }
 +                                
 +                       }
  
-                       if (signal_pending(current)
-                           ||  mutex_lock_interruptible(&u->readlock)) {
+                       if (signal_pending(current)) {
                                err = sock_intr_errno(timeo);
                                goto out;
                        }