From 10be0031875d13c497b9b70de408475fef1100f8 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 24 Nov 2012 22:13:21 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Enable NETPRIO_CGROUP. svn path=/dists/trunk/linux/; revision=19531 --- debian/changelog | 2 +- debian/config/config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 335e6dc2d..43acb1ff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.7 [ Bastian Blank ] - * Enable POWER_SUPPLY and BLK_DEV_THROTTLING. + * Enable POWER_SUPPLY, BLK_DEV_THROTTLING and NETPRIO_CGROUP. * [amd64] Enable CRYPTO_CAMELLIA_X86_64, CRYPTO_SERPENT_AVX_X86_64 and CRYPTO_TWOFISH_AVX_X86_64. * [x86]: Enable more platform drivers. diff --git a/debian/config/config b/debian/config/config index f6fb39e33..134a3f7da 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4047,6 +4047,7 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y +CONFIG_NETPRIO_CGROUP=m CONFIG_BPF_JIT=y CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set