[kernel] switch NF_CONNTRACK to modular

[Kyle McMartin]

commit b86173d0ca012f419381c1112d5e49167f5cf914
Author: Kyle McMartin <kyle at redhat.com>
Date:   Sat May 14 12:15:36 2011 -0400

    switch NF_CONNTRACK to modular

 config-generic |    2 +-
 kernel.spec    |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index 56e9ba6..5e073bb 100644
--- a/config-generic
+++ b/config-generic
@@ -849,7 +849,7 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
diff --git a/kernel.spec b/kernel.spec
index 6c00e56..bb437aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1942,6 +1942,7 @@ fi
   used to host mockroots for mass rebuilds.
 - Drop IMA disabling patch, which is no longer necessary since it's run time
   (but unused) cost is now minimized.
+- Switch NF_CONNTRACK to modular, it'll get autoloaded where necessary.
 
 * Sat May 14 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.39-0.rc7.git6.0
 - Update to 2.6.39-rc7-git6