diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-18 07:29:03 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-18 07:29:03 +0100 |
| commit | a2dd81c581897d371c7b9f8aa71c96801c53fec1 (patch) | |
| tree | c7315ac0e234ba1e4b18513e91ca14173bb8c6b3 /kernel-i686.config | |
| parent | ac37a91d6204b7f29464032e47168bc41219fd3f (diff) | |
| parent | c59b0760c721ca5cf0c9d27e0819598b851ff8c4 (diff) | |
| download | kernel-a2dd81c581897d371c7b9f8aa71c96801c53fec1.tar.gz kernel-a2dd81c581897d371c7b9f8aa71c96801c53fec1.tar.xz kernel-a2dd81c581897d371c7b9f8aa71c96801c53fec1.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc4.git1.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc4.git1.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc4.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 209050f06..0831ed641 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2202,7 +2202,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 -# CONFIG_IPV6_GRE is not set +CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_MIP6=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y |