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

This is the 4.9.238 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc kernel/bpf/hashtab.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc net/ipv4/ip_output.c
index 8eaf20a,c37e959..0701574
--- 1/net/ipv4/ip_output.c
--- 2/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -73,8 -73,8 +73,9 @@@
  #include <net/icmp.h>
  #include <net/checksum.h>
  #include <net/inetpeer.h>
+ #include <net/inet_ecn.h>
  #include <net/lwtunnel.h>
 +#include <linux/bpf-cgroup.h>
  #include <linux/igmp.h>
  #include <linux/netfilter_ipv4.h>
  #include <linux/netfilter_bridge.h>

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge