Merge tag 'v4.9.145' into khadas-vim3-4.9.y
authorNick <nick@khadas.com>
Tue, 21 May 2019 09:43:05 +0000 (17:43 +0800)
committerNick <nick@khadas.com>
Tue, 21 May 2019 09:43:05 +0000 (17:43 +0800)
This is the 4.9.145 stable release

1  2 
Makefile
drivers/tty/serial/kgdboc.c
drivers/usb/core/hub.c
drivers/usb/core/quirks.c
drivers/usb/core/usb.c
drivers/usb/host/xhci.c
include/linux/usb.h
mm/page_alloc.c
scripts/Kbuild.include

diff --cc Makefile
Simple merge
@@@ -230,10 -230,9 +230,10 @@@ static void kgdboc_put_char(u8 chr
                                        kgdb_tty_line, chr);
  }
  
 -static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
 +static int param_set_kgdboc_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 "kgdboc: config string too long\n");
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge