Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable...

diff --cc queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch
index 04fc9462440456be31ef9f39554a8e188f969ee8,79390287a5b7a181f31c1db240e7abbd370956a6..68518b2a65aba388be53532929be4886e17dcacb
--- 1/queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch
--- 2/queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch
+++ b/queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch
@@@ -74,15 -74,17 +74,17 @@@ Cc: Christoph Hellwig <hch@lst.de
  Signed-off-by: Eric Biggers <ebiggers@google.com>
  Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  Signed-off-by: Sasha Levin <sashal@kernel.org>
++Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
++
  ---
 - fs/fuse/dev.c    | 91 +++++++++++++++++++++++++-----------------------
 - fs/fuse/fuse_i.h |  3 ++
 - fs/fuse/inode.c  |  1 +
 + fs/fuse/dev.c    |   91 ++++++++++++++++++++++++++++---------------------------
 + fs/fuse/fuse_i.h |    3 +
 + fs/fuse/inode.c  |    1 
   3 files changed, 51 insertions(+), 44 deletions(-)
  
 -diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
 -index 6ee471b72a34d..6d39143cfa094 100644
  --- a/fs/fuse/dev.c
  +++ b/fs/fuse/dev.c
 -@@ -331,7 +331,7 @@ static void queue_request(struct fuse_iqueue *fiq, struct fuse_req *req)
 +@@ -331,7 +331,7 @@ static void queue_request(struct fuse_iq
        req->in.h.len = sizeof(struct fuse_in_header) +
                len_args(req->in.numargs, (struct fuse_arg *) req->in.args);
        list_add_tail(&req->list, &fiq->pending);