Merge tag 'v4.9.209' into khadas-vims-4.9.y
authorNick Xie <nick@khadas.com>
Wed, 27 May 2020 09:52:04 +0000 (17:52 +0800)
committerNick Xie <nick@khadas.com>
Wed, 27 May 2020 09:52:04 +0000 (17:52 +0800)
This is the 4.9.209 stable release

 Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

1  2 
Makefile
arch/arm64/include/asm/pgtable.h
arch/arm64/mm/fault.c
drivers/gpio/gpiolib.c
drivers/usb/serial/option.c
fs/pstore/ram.c
kernel/trace/ftrace.c
mm/mmap.c
net/ipv4/tcp_input.c
net/rfkill/core.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/pstore/ram.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge
Simple merge
Simple merge