From: Nick Xie <nick@khadas.com>
Date: Sat, 7 Nov 2020 02:27:45 +0000 (+0800)
Subject: Merge tag 'v4.9.238' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3522b9ffc771f440ea405e70661542e46f0f58eb;p=platform%2Fkernel%2Flinux-amlogic.git

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

This is the 4.9.238 stable release
---

3522b9ffc771f440ea405e70661542e46f0f58eb
diff --cc net/ipv4/ip_output.c
index 8eaf20a6046d,c37e9598262e..0701574e997b
--- a/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>