switch NF_CONNTRACK to modular

This commit is contained in:
Kyle McMartin 2011-05-14 12:15:36 -04:00
parent 0c14650a47
commit b86173d0ca
2 changed files with 2 additions and 1 deletions

View File

@ -849,7 +849,7 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_ADVANCED=y
CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK=m
CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK_LOG=m

View File

@ -1942,6 +1942,7 @@ fi
used to host mockroots for mass rebuilds. used to host mockroots for mass rebuilds.
- Drop IMA disabling patch, which is no longer necessary since it's run time - Drop IMA disabling patch, which is no longer necessary since it's run time
(but unused) cost is now minimized. (but unused) cost is now minimized.
- Switch NF_CONNTRACK to modular, it'll get autoloaded where necessary.
* Sat May 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc7.git6.0 * Sat May 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc7.git6.0
- Update to 2.6.39-rc7-git6 - Update to 2.6.39-rc7-git6