From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Apr 2019 05:49:24 +0000 (+0200)
Subject: Merge 5.1-rc3 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b397f82585c3101dcf92642dd359891e66d00c55;p=linux.git

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>
---

b397f82585c3101dcf92642dd359891e66d00c55
diff --cc drivers/staging/erofs/unzip_vle.c
index 566835cf6f2fe,31eef83957743..a2e03c932102a
--- a/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);