debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

net: Re-enable CGROUP_NET_PRIO as builtin (it can no longer be modular) 

svn path=/dists/trunk/linux/; revision=21580
This commit is contained in:
Ben Hutchings 2014-07-20 01:06:16 +00:00
parent dcb40eedc6
commit 3bc821bbfb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ linux (3.16~rc5-1~exp2) experimental; urgency=medium
[ Ben Hutchings ]
* [x86] wireless: Enable R8192EE as module (Closes: #755310)
* net: Re-enable CGROUP_NET_PRIO as builtin
-- Aurelien Jarno <aurel32@debian.org> Wed, 16 Jul 2014 18:07:48 +0200

2
debian/config/config vendored
View File

@ -5063,7 +5063,7 @@ CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
CONFIG_BRIDGE_NETFILTER=y
CONFIG_CGROUP_NET_PRIO=m
CONFIG_CGROUP_NET_PRIO=y
CONFIG_BPF_JIT=y
CONFIG_NET_PKTGEN=m
# CONFIG_NET_TCPPROBE is not set