Merge tag 'v3.10.77' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mtd / ubi / wl.c

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 890890d67bfea2434074be83547be271764ee9b6..f4d9fe8837ebd4a58ab8fda813e557276c1b03f0 100644 (file)
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1014,8 +1014,13 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *fm_e,
 static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
                                int cancel)
 {
+<<<<<<< HEAD
        int erase_e2=1, err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0;
        int vol_id = -1, uninitialized_var(lnum);
+=======
+       int err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0;
+       int vol_id = -1, lnum = -1;
+>>>>>>> v3.10.77
 #ifdef CONFIG_MTD_UBI_FASTMAP
        int anchor = wrk->anchor;
 #endif