summaryrefslogtreecommitdiffstats
path: root/net/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-11 14:43:39 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-11 14:43:39 -0500
commit02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch)
tree08a39341379ce6f1ad4f3997df36c76ee82cee9c /net/Kconfig
parent265592a1dfc31ecab02a960721a1f137e50afb17 (diff)
parentba836a6f5ab1243ff5e08a941a2d1de8b31244e1 (diff)
downloadlinux-stable-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz
linux-stable-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.bz2
linux-stable-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/Kconfig b/net/Kconfig
index 2e9ee61822e2..92ae1500d9e1 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -259,10 +259,6 @@ config XPS
config HWBM
bool
-config SOCK_CGROUP_DATA
- bool
- default n
-
config CGROUP_NET_PRIO
bool "Network priority cgroup"
depends on CGROUPS