Merge branch 'master' into next

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 4f2daa5bbecf..41d47e1cf15c 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -320,7 +320,7 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb,
         }
 
         err = ubi_io_read_data(ubi, buf, pnum, 0, len);
-        if (err && err != UBI_IO_BITFLIPS)
+        if (err && err != UBI_IO_BITFLIPS && err != -EBADMSG)
                 goto out_free_buf;
 
         data_crc = be32_to_cpu(vid_hdr->data_crc);