diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-23 17:54:35 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-23 17:54:35 +0100 |
commit | 9ea96a82a9afc439b39ee838a64fd0d9630d2835 (patch) | |
tree | fee6980c290792e850ac203b1a0e649e0dcf6614 /baseconfig/CONFIG_NF_CONNTRACK_IPV4 | |
parent | b23212950e690f04005b72c05574114b82ee38c8 (diff) | |
parent | d9bf1c02937ca02309c3a0305e4fd6b39ee464ff (diff) | |
download | kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc25.tar.gz kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc25.tar.xz kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git9.1.vanilla.knurd.1.fc24
Diffstat (limited to 'baseconfig/CONFIG_NF_CONNTRACK_IPV4')
-rw-r--r-- | baseconfig/CONFIG_NF_CONNTRACK_IPV4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_IPV4 b/baseconfig/CONFIG_NF_CONNTRACK_IPV4 index e8289b55e..af4f32370 100644 --- a/baseconfig/CONFIG_NF_CONNTRACK_IPV4 +++ b/baseconfig/CONFIG_NF_CONNTRACK_IPV4 @@ -1 +1 @@ -CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NF_CONNTRACK_IPV4=m |