Merge 5.1-rc3 into staging-next

We want those fixes and this resolves an erofs merge conflict.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/comedi/drivers/ni_mio_common.c
Simple merge

diff --cc drivers/staging/erofs/unzip_vle.c
index 566835cf6f2fef1dfcddb3f9d86b0579ebfc9ca9,31eef839577436709b1a5261507aff59bcf821d7..a2e03c932102a706f6a781f490d283c0739b8297
--- 1/drivers/staging/erofs/unzip_vle.c
--- 2/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@@ -1038,9 -1043,13 +1038,13 @@@ repeat
  
  skip_allocpage:
        vout = erofs_vmap(pages, nr_pages);
+       if (!vout) {
+               err = -ENOMEM;
+               goto out;
+       }
  
 -      err = z_erofs_vle_unzip_vmap(compressed_pages,
 -              clusterpages, vout, llen, work->pageofs, overlapped);
 +      err = z_erofs_vle_unzip_vmap(compressed_pages, clusterpages, vout,
 +                                   llen, work->pageofs, overlapped);
  
        erofs_vunmap(vout, nr_pages);
  

diff --cc drivers/staging/rtl8712/rtl8712_cmd.c
Simple merge

diff --cc drivers/staging/rtl8712/rtl8712_cmd.h
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
Simple merge