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 <[email protected]>
This commit is contained in:
David S. Miller 2017-01-11 14:43:39 -05:00
commit 02ac5d1487
101 changed files with 778 additions and 415 deletions

View file

@ -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