Merge 5.1-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
We want those fixes and this resolves an erofs merge conflict.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/erofs/unzip_vle.c
drivers/staging/rtl8712/rtl8712_cmd.c
drivers/staging/rtl8712/rtl8712_cmd.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.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);
  
Simple merge
Simple merge