From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:50:56 +0000 (+0100)
Subject: Merge tag 'v3.10.95' into update
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=f3d34b554faffa56f5c570aa01fb3265f61b500d

Merge tag 'v3.10.95' into update

This is the 3.10.95 stable release
---

f3d34b554faffa56f5c570aa01fb3265f61b500d
diff --cc drivers/usb/core/hub.c
index 66c287e756ec,92873f2773fc..67c6d0d4ba0b
--- a/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 net/unix/af_unix.c
index 8db136a9d87b,f934e7ba5eb8..5bf16d9d4330
--- a/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;
  			}