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

15 files changed:
1  2 
Documentation/kernel-parameters.txt
Documentation/networking/ip-sysctl.txt
Makefile
arch/arm/boot/compressed/head.S
drivers/block/loop.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/usb/core/driver.c
drivers/usb/core/hub.c
drivers/usb/core/message.c
drivers/usb/core/usb.h
kernel/sched/fair.c
kernel/trace/trace.c
net/ipv4/route.c
net/ipv4/sysctl_net_ipv4.c
scripts/Kbuild.include

Simple merge
diff --cc Makefile
Simple merge
Simple merge
  
  static DEFINE_IDR(loop_index_idr);
  static DEFINE_MUTEX(loop_index_mutex);
- static DEFINE_MUTEX(loop_ctl_mutex);
  
 +#ifdef CONFIG_AMLOGIC_MODIFY
 +static int max_part = 4;
 +#else
  static int max_part;
 +#endif
  static int part_shift;
  
  static int transfer_xor(struct loop_device *lo, int cmd,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge