rpms/kernel/devel config-generic, 1.170, 1.171 kernel.spec, 1.984, 1.985

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32468

Modified Files:
	config-generic kernel.spec 
Log Message:
Change some more netfilter bits we always load to be built-ins.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- config-generic	25 Sep 2008 19:58:13 -0000	1.170
+++ config-generic	25 Sep 2008 20:57:46 -0000	1.171
@@ -786,7 +786,7 @@
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
@@ -828,7 +828,7 @@
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -883,7 +883,7 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
@@ -891,8 +891,9 @@
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
+
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
 
 #
 # IPv6: Netfilter Configuration


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- kernel.spec	25 Sep 2008 20:36:21 -0000	1.984
+++ kernel.spec	25 Sep 2008 20:57:46 -0000	1.985
@@ -1733,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Change some more netfilter bits we always load to be built-ins.
+
 * Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
 - Remove i8042 "No controller found." noise.