Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

to pick up the KVM fix which is required for the NX series.

1 files changed, 2 insertions, 2 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f8bbc4aab213..4b92b196cfa6 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -740,7 +740,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
                 /* fall through */
         case TIPC_LISTEN:
         case TIPC_CONNECTING:
-                if (!skb_queue_empty(&sk->sk_receive_queue))
+                if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                         revents |= EPOLLIN | EPOLLRDNORM;
                 break;
         case TIPC_OPEN:
@@ -748,7 +748,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
                         revents |= EPOLLOUT;
                 if (!tipc_sk_type_connectionless(sk))
                         break;
-                if (skb_queue_empty(&sk->sk_receive_queue))
+                if (skb_queue_empty_lockless(&sk->sk_receive_queue))
                         break;
                 revents |= EPOLLIN | EPOLLRDNORM;
                 break;