packages: kernel/kernel-patches.config, kernel/kernel-tuxonice.config, kern...

[baggins]

Author: baggins                      Date: Mon Jul 11 11:09:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0-rc6 and cleaned up

---- Files affected:
packages/kernel:
   kernel-patches.config (1.10 -> 1.11) , kernel-tuxonice.config (1.2 -> 1.3) , kernel-vserver.config (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-patches.config
diff -u packages/kernel/kernel-patches.config:1.10 packages/kernel/kernel-patches.config:1.11
--- packages/kernel/kernel-patches.config:1.10	Sun May  1 17:26:18 2011
+++ packages/kernel/kernel-patches.config	Mon Jul 11 13:09:06 2011
@@ -5,25 +5,12 @@
 ATM_DD all=m
 
 #-
-#- *** FILE: drivers/net/wan/Kconfig ***
-#-
-TAHOE9XX all=m
-
-#-
-#- *** FILE: drivers/message/fusion/Kconfig ***
-#-
-FUSION_MAX_FC_SGE all=256 sparc=n
-
-#-
 #- *** FILE: fs/Kconfig ***
 #-
 UNION_FS all=m
 UNION_FS_XATTR all=y
 UNION_FS_DEBUG all=n
 
-SQUASHFS_FRAGMENT_CACHE_SIZE all=3
-SQUASHFS_LZMA all=y
-
 #-
 #- *** FILE: fs/aufs/Kconfig ***
 #-
@@ -34,9 +21,9 @@
 AUFS_BRANCH_MAX_32767 all=n
 AUFS_HNOTIFY all=y
 AUFS_HFSNOTIFY all=y
-AUFS_HINOTIFY all=n
 AUFS_EXPORT all=y
 AUFS_RDU all=y
+AUFS_PROC_MAP all=n
 AUFS_SP_IATTR all=y
 AUFS_SHWH all=y
 AUFS_BR_RAMFS all=y
@@ -45,12 +32,29 @@
 AUFS_DEBUG all=n
 
 #-
-#- *** FILE: net/ring/Kconfig ***
+#- *** FILE: net/sched/Kconfig ***
 #-
-RING all=m
-
 NET_SCH_ESFQ all=m
 NET_SCH_ESFQ_NFCT all=y
 
-# virtio-gl
+#-
+#- *** FILE: drivers/gpu/misc/Kconfig ***
+#-
 VIRTIOGL=m
+
+#-
+#- *** FILE: net/ipv4/netfilter/Kconfig ***
+#-
+IP_NF_TARGET_IPV4OPTSSTRIP all=m
+IP_NF_MATCH_IPV4OPTIONS all=m
+NF_NAT_MMS all=m
+NF_CONNTRACK_RSH all=m
+IP_NF_MATCH_RPC all=m
+NF_NAT_RTSP all=m
+
+#-
+#- *** FILE: net/netfilter/Kconfig ***
+#-
+NF_CONNTRACK_MMS all=m
+NETFILTER_XT_MATCH_LAYER7=m
+# NETFILTER_XT_MATCH_LAYER7_DEBUG is not set

================================================================
Index: packages/kernel/kernel-tuxonice.config
diff -u packages/kernel/kernel-tuxonice.config:1.2 packages/kernel/kernel-tuxonice.config:1.3
--- packages/kernel/kernel-tuxonice.config:1.2	Tue Mar 31 14:04:34 2009
+++ packages/kernel/kernel-tuxonice.config	Mon Jul 11 13:09:06 2011
@@ -1,20 +1,11 @@
-
-#-
-#- *** FILE: crypto/Kconfig ***
-#-
-CRYPTO_LZF all=m
-
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
-PRINTK_NOSAVE all=n
 TOI_CORE all=m
 #- Image Storage (you need at least one allocator)
 TOI_FILE all=m
 TOI_SWAP all=m
 #- General Options
-TOI_DEFAULT_PRE_HIBERNATE all=""
-TOI_DEFAULT_POST_HIBERNATE all=""
 TOI_CRYPTO all=m
 #- No compression support available without Cryptoapi support.
 TOI_USERUI all=m
@@ -27,3 +18,4 @@
 TOI_CHECKSUM all=n
 TOI_PAGEFLAGS_TEST all=m
 TOI all=y
+TOI_EXPORTS all=y

================================================================
Index: packages/kernel/kernel-vserver.config
diff -u packages/kernel/kernel-vserver.config:1.5 packages/kernel/kernel-vserver.config:1.6
--- packages/kernel/kernel-vserver.config:1.5	Sat Oct 23 19:18:27 2010
+++ packages/kernel/kernel-vserver.config	Mon Jul 11 13:09:06 2011
@@ -35,21 +35,3 @@
 CONFIG_QUOTES_ISO8859 all=y
 CONFIG_QUOTES_UTF8 all=n
 CONFIG_QUOTES_ASCII all=n
-
-#-
-#- *** FILE: net/Kconfig ***
-#-
-#- file net/packet/Kconfig goes here
-
-#-
-#- *** PROBABLY REMOVED OPTIONS ***
-#-
-CONFIG_PROPAGATE all=n
-CONFIG_TAGGING_RUNTIME all=n
-CONFIG_VSERVER_DYNAMIC_IDS all=n
-CONFIG_VSERVER_LEGACY all=n
-CONFIG_VSERVER_LEGACYNET all=n
-CONFIG_VSERVER_LEGACY_VERSION all=n
-CONFIG_VSERVER_REMAP_SADDR all=n
-
-CONFIG_CFS_HARD_LIMITS all=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.config?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver.config?r1=1.5&r2=1.6&f=u