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

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

This is the 4.9.189 stable release

Conflicts:
net/ipv6/ip6_tunnel.c

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/if_pppox.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/if_pppox.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history