Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 20 Aug 2017 14:34:06 +0000 (17:34 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 20 Aug 2017 14:34:06 +0000 (17:34 +0300)
21 files changed:
1  2 
Documentation/kernel-parameters.txt
arch/arm/kernel/hw_breakpoint.c
arch/arm/kernel/ptrace.c
arch/arm/mm/dma-mapping.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/mmc/card/block.c
drivers/mtd/ubi/upd.c
drivers/usb/gadget/inode.c
fs/exec.c
fs/proc/task_mmu.c
fs/splice.c
fs/ubifs/dir.c
fs/ubifs/tnc.c
fs/ubifs/xattr.c
include/linux/mm.h
kernel/sched.c
kernel/trace/trace.c
mm/huge_memory.c
mm/memory.c
mm/swapfile.c

Simple merge
Simple merge
Simple merge
@@@ -590,10 -365,9 +590,10 @@@ static void *__dma_alloc(struct device 
   * Allocate DMA-coherent memory space and return both the kernel remapped
   * virtual and bus address for that space.
   */
 -void *
 -dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
 +void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 +                  gfp_t gfp, struct dma_attrs *attrs)
  {
-       pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel);
++      pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
        void *memory;
  
        if (dma_alloc_from_coherent(dev, size, handle, &memory))
Simple merge
Simple merge
Simple merge
@@@ -150,11 -150,11 +150,11 @@@ int ubi_start_update(struct ubi_device 
                        return err;
        }
  
-       if (bytes == 0) {
-               err = ubi_wl_flush(ubi, UBI_ALL, UBI_ALL);
-               if (err)
-                       return err;
 -      err = ubi_wl_flush(ubi);
++      err = ubi_wl_flush(ubi, UBI_ALL, UBI_ALL);
+       if (err)
+               return err;
  
+       if (bytes == 0) {
                err = clear_update_marker(ubi, vol, 0);
                if (err)
                        return err;
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc fs/ubifs/dir.c
Simple merge
diff --cc fs/ubifs/tnc.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
diff --cc mm/memory.c
Simple merge
diff --cc mm/swapfile.c
Simple merge