SOURCES (LINUX_2_6): kernel-netfilter.config, kernel-vserver.confi...

[baggins]

Author: baggins                      Date: Tue Aug  7 20:03:15 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- 2.6.22

---- Files affected:
SOURCES:
   kernel-netfilter.config (1.34.2.65 -> 1.34.2.66) , kernel-vserver.config (1.1.2.27 -> 1.1.2.28) 

---- Diffs:

================================================================
Index: SOURCES/kernel-netfilter.config
diff -u SOURCES/kernel-netfilter.config:1.34.2.65 SOURCES/kernel-netfilter.config:1.34.2.66
--- SOURCES/kernel-netfilter.config:1.34.2.65	Wed May  2 11:32:12 2007
+++ SOURCES/kernel-netfilter.config	Tue Aug  7 22:03:09 2007
@@ -5,8 +5,6 @@
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y

================================================================
Index: SOURCES/kernel-vserver.config
diff -u SOURCES/kernel-vserver.config:1.1.2.27 SOURCES/kernel-vserver.config:1.1.2.28
--- SOURCES/kernel-vserver.config:1.1.2.27	Mon Apr 30 12:11:32 2007
+++ SOURCES/kernel-vserver.config	Tue Aug  7 22:03:09 2007
@@ -1,14 +1,11 @@
 #
 # Linux VServer
 #
-# CONFIG_VSERVER_LEGACY is not set
-# CONFIG_VSERVER_LEGACYNET is not set
-# CONFIG_VSERVER_REMAP_SADDR is not set
 CONFIG_BLK_DEV_VROOT=m
 
 CONFIG_VSERVER=y
 CONFIG_VSERVER_SECURITY=y
-# CONFIG_VSERVER_SINGLE_IP is not set
+CONFIG_VSERVER_AUTO_SINGLE=y
 CONFIG_VSERVER_AUTO_LBACK=y
 CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set
@@ -25,5 +22,6 @@
 # CONFIG_TAG_NFSD is not set
 # CONFIG_PROPAGATE is not set
 CONFIG_VSERVER_PRIVACY=y
++CONFIG_VSERVER_CONTEXTS=256
 CONFIG_VSERVER_WARN=y
 # CONFIG_VSERVER_DEBUG is not set
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.65&r2=1.34.2.66&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-vserver.config?r1=1.1.2.27&r2=1.1.2.28&f=u