Merge tag 'v4.9.183' into khadas-vims-4.9.y-update
authorNick Xie <nick@khadas.com>
Thu, 25 Jul 2019 10:04:19 +0000 (18:04 +0800)
committerNick Xie <nick@khadas.com>
Thu, 25 Jul 2019 10:04:19 +0000 (18:04 +0800)
This is the 4.9.183 stable release

17 files changed:
1  2 
Makefile
arch/arm/kernel/smp.c
arch/arm64/mm/mmu.c
drivers/media/v4l2-core/v4l2-ioctl.c
drivers/misc/kgdbts.c
drivers/usb/core/quirks.c
fs/f2fs/inode.c
fs/f2fs/recovery.c
fs/f2fs/segment.h
fs/fuse/dev.c
fs/inode.c
ipc/mqueue.c
kernel/Makefile
kernel/sys.c
kernel/sysctl.c
mm/cma.c
mm/page_alloc.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1130,10 -1130,9 +1130,10 @@@ static void kgdbts_put_char(u8 chr
                ts.run_test(0, chr);
  }
  
 -static int param_set_kgdbts_var(const char *kmessage, struct kernel_param *kp)
 +static int param_set_kgdbts_var(const char *kmessage,
 +                              const struct kernel_param *kp)
  {
-       int len = strlen(kmessage);
+       size_t len = strlen(kmessage);
  
        if (len >= MAX_CONFIG_LEN) {
                printk(KERN_ERR "kgdbts: config string too long\n");
Simple merge
diff --cc fs/f2fs/inode.c
Simple merge
Simple merge
Simple merge
diff --cc fs/fuse/dev.c
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc ipc/mqueue.c
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/sys.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc mm/cma.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge