net/sched: Change NET_CLS_CGROUP back to built-in

Due to the way cgroup subsystems are tracked, changing any of them
between built-in and modular is an ABI change, so don't change this
right now.

svn path=/dists/sid/linux/; revision=20520
This commit is contained in:
Ben Hutchings 2013-08-17 20:15:05 +00:00
parent 2ffd7a7e78
commit 05a091e150
2 changed files with 1 additions and 2 deletions

1
debian/changelog vendored
View File

@ -73,7 +73,6 @@ linux (3.10.7-1) UNRELEASED; urgency=low
* [arm] Fix the world famous typo with is_gate_vma()
* [rt] Update to 3.10.6-rt3
- hpsa: fix warning with smp_processor_id() in preemptible
* net/sched: Change NET_CLS_CGROUP from built-in to module
* [arm] Change SERIAL_8250_PCI from built-in to module
* net: Change WIZNET_W5{1,3}00 from built-in(!) to module
* net: Change DROP_MONITOR from built-in to module

View File

@ -5033,7 +5033,7 @@ CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
CONFIG_NET_CLS_CGROUP=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m