[linux] 07/14: Enable NET_ACT_SAMPLE

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch master
in repository linux.

commit 7bd33d45fdf53d071433218fbc15e04e39620055
Author: Bastian Blank <waldi at debian.org>
Date:   Thu Jan 18 18:55:55 2018 +0100

    Enable NET_ACT_SAMPLE
---
 debian/changelog     | 2 +-
 debian/config/config | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 23b02b9..16144bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
     - Support Amazon EC2.
   * Enable NUMA_BALANCING_DEFAULT_ENABLED, enabled by all others.
   * Enable INET_ESP_OFFLOAD, INET6_ESP_OFFLOAD, IPV6_SEG6_LWTUNNEL,
-    IPV6_SEG6_HMAC, NF_LOG_NETDEV, IP_SET_HASH_IPMAC.
+    IPV6_SEG6_HMAC, NF_LOG_NETDEV, IP_SET_HASH_IPMAC, NET_ACT_SAMPLE.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 18 Jan 2018 09:14:57 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 79c26e8..75ff5b4 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -6981,6 +6981,7 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git