Merge v4.20-rc4 into drm-next

Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index 593826e11a53..334fcc617ef2 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -853,7 +853,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
         struct socket *sock = file->private_data;
 
         if (unlikely(!sock->ops->splice_read))
-                return -EINVAL;
+                return generic_file_splice_read(file, ppos, pipe, len, flags);
 
         return sock->ops->splice_read(sock, ppos, pipe, len, flags);
 }