summaryrefslogtreecommitdiffstats
path: root/net/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-03-31 15:15:47 +1000
committerDave Airlie <airlied@redhat.com>2020-03-31 15:15:47 +1000
commit5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc (patch)
tree6091ced63dbba747619762470ebba2298676ea0d /net/Kconfig
parent700d6ab987f3b5e28b13b5993e5a9a975c5604e2 (diff)
parent7111951b8d4973bda27ff663f2cf18b663d15b48 (diff)
downloadlinux-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.tar.bz2
Merge v5.6 into drm-next
msm needed rc6, so I just went and merged release (msm has been in drm-next outside of this tree) Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig
index 2eeb0e55f7c9..df8d8c9bd021 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -52,6 +52,9 @@ config NET_INGRESS
config NET_EGRESS
bool
+config NET_REDIRECT
+ bool
+
config SKB_EXTENSIONS
bool