Merge tag 'v3.10.92' into update

This is the 3.10.92 stable release

diff --cc Makefile
Simple merge

diff --cc include/net/af_unix.h
index 9120783132e71c5d653e85c6b300507b579457b7,e927d3e80b61597da1a2591c8ffee0a2ad92d1f6..6867600245725a22f4431533f1d35878fbe11bed
--- 1/include/net/af_unix.h
--- 2/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@@ -62,9 -62,12 +62,13 @@@ struct unix_sock 
  #define UNIX_GC_CANDIDATE     0
  #define UNIX_GC_MAYBE_CYCLE   1
        struct socket_wq        peer_wq;
 +      wait_queue_t            peer_wake;
  };
- #define unix_sk(__sk) ((struct unix_sock *)__sk)
+ 
+ static inline struct unix_sock *unix_sk(struct sock *sk)
+ {
+       return (struct unix_sock *)sk;
+ }
  
  #define peer_wait peer_wq.wait
  

diff --cc include/net/sock.h
index 02199accb6be2b9ddeffdef24dc001c686b2e9d5,95dc0c8a9dac078d640bec98170b8eb81b8d7cc5..3547a6f347d14fd4de56a4d00c1d5c0d78dc4bec
--- 1/include/net/sock.h
--- 2/include/net/sock.h
+++ b/include/net/sock.h
@@@ -780,12 -780,16 +780,21 @@@ static inline __must_check int sk_add_b
                                              unsigned int limit)
  {
        if (sk_rcvqueues_full(sk, skb, limit))
 +      {
 +              #ifdef CONFIG_MTK_NET_LOGGING 
 +              printk(KERN_ERR "[mtk_net][sock]sk_add_backlog->sk_rcvqueues_full sk->sk_rcvbuf:%d,sk->sk_sndbuf:%d ",sk->sk_rcvbuf,sk->sk_sndbuf);
 +              #endif          
                return -ENOBUFS;
 +      }
+ 
+       /*
+        * If the skb was allocated from pfmemalloc reserves, only
+        * allow SOCK_MEMALLOC sockets to use it as this socket is
+        * helping free memory
+        */
+       if (skb_pfmemalloc(skb) && !sock_flag(sk, SOCK_MEMALLOC))
+               return -ENOMEM;
+ 
        __sk_add_backlog(sk, skb);
        sk->sk_backlog.len += skb->truesize;
        return 0;

diff --cc kernel/workqueue.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge