Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Feb 2013 21:00:34 +0000 (23:00 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Feb 2013 21:00:34 +0000 (23:00 +0200)
Conflicts:
drivers/mtd/ubi/attach.c

18 files changed:
1  2 
arch/arm/Kconfig
arch/arm/kernel/head.S
arch/arm/mm/dma-mapping.c
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/nand/omap2.c
drivers/mtd/ubi/attach.c
drivers/mtd/ubi/build.c
drivers/usb/musb/musb_core.c
fs/exec.c
fs/splice.c
fs/ubifs/lprops.c
fs/ubifs/ubifs.h
kernel/exit.c
kernel/sched.c
kernel/signal.c
mm/memory.c
mm/shmem.c
mm/truncate.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -975,12 -997,10 +975,12 @@@ static int scan_peb(struct ubi_device *
                        return err;
                goto adjust_mean_ec;
        case UBI_IO_FF:
-               if (ec_err)
+               if (ec_err || bitflips)
 -                      err = add_to_list(si, pnum, ec, 1, &si->erase);
 +                      err = add_to_list(ai, pnum, UBI_UNKNOWN,
 +                                        UBI_UNKNOWN, ec, 1, &ai->erase);
                else
 -                      err = add_to_list(si, pnum, ec, 0, &si->free);
 +                      err = add_to_list(ai, pnum, UBI_UNKNOWN,
 +                                        UBI_UNKNOWN, ec, 0, &ai->free);
                if (err)
                        return err;
                goto adjust_mean_ec;
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/splice.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc mm/memory.c
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/truncate.c
Simple merge