review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

Merge tag 'v4.9.209' into khadas-vims-4.9.y

This is the 4.9.209 stable release

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

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/fault.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/core.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/fault.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/core.c	diff1 \|	diff2 \|	blob \| history