Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 13 Dec 2015 17:57:16 +0000 (19:57 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 13 Dec 2015 17:57:16 +0000 (19:57 +0200)
23 files changed:
1  2 
arch/arm/Makefile
arch/x86/Kconfig
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mtd/ubi/attach.c
drivers/mtd/ubi/cdev.c
drivers/mtd/ubi/eba.c
drivers/mtd/ubi/io.c
drivers/mtd/ubi/vtbl.c
drivers/mtd/ubi/wl.c
drivers/net/usb/asix.c
drivers/usb/musb/musb_core.c
fs/cifs/cifsfs.c
fs/debugfs/inode.c
fs/exec.c
fs/namei.c
fs/proc/task_mmu.c
fs/splice.c
kernel/sched.c
mm/hugetlb.c
mm/memory.c
mm/page-writeback.c
mm/slub.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -475,8 -475,11 +475,8 @@@ static long vol_cdev_ioctl(struct file 
                /* Validate the request */
                err = -EINVAL;
                if (req.lnum < 0 || req.lnum >= vol->reserved_pebs ||
-                   req.bytes < 0 || req.lnum >= vol->usable_leb_size)
+                   req.bytes < 0 || req.bytes > vol->usable_leb_size)
                        break;
 -              if (req.dtype != UBI_LONGTERM && req.dtype != UBI_SHORTTERM &&
 -                  req.dtype != UBI_UNKNOWN)
 -                      break;
  
                err = get_exclusive(desc);
                if (err < 0)
@@@ -1253,8 -1260,9 +1253,9 @@@ int ubi_eba_init(struct ubi_device *ubi
                                 * This may happen in case of an unclean reboot
                                 * during re-size.
                                 */
 -                              ubi_scan_move_to_list(sv, seb, &si->erase);
 +                              ubi_move_aeb_to_list(av, aeb, &ai->erase);
-                       vol->eba_tbl[aeb->lnum] = aeb->pnum;
+                       else
 -                              vol->eba_tbl[seb->lnum] = seb->pnum;
++                              vol->eba_tbl[aeb->lnum] = aeb->pnum;
                }
        }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/memory.c
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge