SOURCES (hawk-LINUX_2_6): kernel-alpha.config, kernel-alpha-smp.co...

hawk hawk at pld-linux.org
Mon May 7 16:16:09 CEST 2007


Author: hawk                         Date: Mon May  7 14:16:09 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- merged updates to 2.6.21.1 from kernel-vanilla-*.config at AC-branch

---- Files affected:
SOURCES:
   kernel-alpha.config (1.30.6.3.2.169.4.1 -> 1.30.6.3.2.169.4.2) , kernel-alpha-smp.config (1.33.10.176.4.1 -> 1.33.10.176.4.2) , kernel-common.config (1.1.2.3 -> 1.1.2.4) , kernel-i386.config (1.82.10.163.2.2 -> 1.82.10.163.2.3) , kernel-i386-smp.config (1.59.10.154.2.2 -> 1.59.10.154.2.3) , kernel-netfilter.config (1.34.2.63.4.2 -> 1.34.2.63.4.3) , kernel-ppc.config (1.3.2.3.2.2.2.206.4.2 -> 1.3.2.3.2.2.2.206.4.3) , kernel-ppc-smp.config (1.6.4.1.2.206.4.2 -> 1.6.4.1.2.206.4.3) , kernel-sparc64.config (1.48.2.121.4.1 -> 1.48.2.121.4.2) , kernel-sparc64-smp.config (1.48.2.136.4.1 -> 1.48.2.136.4.2) , kernel-sparc.config (1.37.2.135.4.4 -> 1.37.2.135.4.5) , kernel-sparc-smp.config (1.9.2.6.2.103.4.2 -> 1.9.2.6.2.103.4.3) , kernel-x86_64.config (1.1.2.137.2.2 -> 1.1.2.137.2.3) , kernel-x86_64-smp.config (1.1.2.137.2.2 -> 1.1.2.137.2.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-alpha.config
diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.169.4.1 SOURCES/kernel-alpha.config:1.30.6.3.2.169.4.2
--- SOURCES/kernel-alpha.config:1.30.6.3.2.169.4.1	Sat Jan 27 14:07:40 2007
+++ SOURCES/kernel-alpha.config	Mon May  7 16:16:04 2007
@@ -3120,9 +3120,11 @@
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set

================================================================
Index: SOURCES/kernel-alpha-smp.config
diff -u SOURCES/kernel-alpha-smp.config:1.33.10.176.4.1 SOURCES/kernel-alpha-smp.config:1.33.10.176.4.2
--- SOURCES/kernel-alpha-smp.config:1.33.10.176.4.1	Sat Jan 27 14:07:40 2007
+++ SOURCES/kernel-alpha-smp.config	Mon May  7 16:16:04 2007
@@ -3127,9 +3127,11 @@
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set

================================================================
Index: SOURCES/kernel-common.config
diff -u SOURCES/kernel-common.config:1.1.2.3 SOURCES/kernel-common.config:1.1.2.4
--- SOURCES/kernel-common.config:1.1.2.3	Wed Mar 28 16:40:44 2007
+++ SOURCES/kernel-common.config	Mon May  7 16:16:04 2007
@@ -197,6 +197,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -236,6 +237,7 @@
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_INET_XFRM_MODE_BEET=m
 
 #
@@ -595,6 +597,7 @@
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -836,10 +839,12 @@
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_DELKIN=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_BLK_DEV_IDEACPI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 
 #
@@ -876,6 +881,7 @@
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_SC1200=m
 CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_IT821X=m
 CONFIG_BLK_DEV_NS87415=m
 CONFIG_BLK_DEV_PDC202XX_OLD=m
@@ -887,6 +893,7 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
+CONFIG_BLK_DEV_TC86C001=m
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
@@ -1061,6 +1068,7 @@
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INIC162X=m
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
@@ -1078,6 +1086,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 CONFIG_PATA_LEGACY=m
 CONFIG_PATA_TRIFLEX=m
@@ -1355,6 +1364,7 @@
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
+CONFIG_SC92031=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
@@ -1387,6 +1397,7 @@
 CONFIG_MV643XX_ETH_1=y
 CONFIG_MV643XX_ETH_2=y
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1394,6 +1405,7 @@
 CONFIG_CHELSIO_T1=m
 # CONFIG_CHELSIO_T1_1G is not set
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
@@ -1521,6 +1533,7 @@
 CONFIG_WANXL=m
 CONFIG_PC300=m
 CONFIG_PC300_MLPPP=y
+CONFIG_PC300TOO=m
 CONFIG_N2=m
 CONFIG_C101=m
 CONFIG_FARSYNC=m
@@ -1572,6 +1585,7 @@
 CONFIG_ATM_HE_USE_SUNI=y
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
 CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
@@ -1664,6 +1678,7 @@
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
 CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
 
@@ -1672,6 +1687,7 @@
 #
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
@@ -1794,6 +1810,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m
 
 #
@@ -2130,6 +2147,7 @@
 #
 # SPI Protocol Masters
 #
+CONFIG_SPI_AT25=y
 
 #
 # Dallas's 1-wire bus
@@ -2161,6 +2179,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ASB100=m
@@ -2205,12 +2224,19 @@
 CONFIG_SENSORS_W83793=m
 
 #
+# Multifunction device drivers
+#
+CONFIG_MFD_SM501=m
+
+#
 # Misc devices
 #
 CONFIG_IBM_ASM=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
 # CONFIG_MSI_LAPTOP is not set
 
 #
@@ -2355,6 +2381,9 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_VP702X=m
@@ -2509,6 +2538,7 @@
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
+CONFIG_FB_S3=m
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 # CONFIG_FB_SAVAGE_ACCEL is not set
@@ -2526,6 +2556,7 @@
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_SM501=m
 CONFIG_FB_VIRTUAL=m
 
 #
@@ -2558,6 +2589,7 @@
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_LCD_DEVICE=y
 
 #
@@ -2604,6 +2636,7 @@
 CONFIG_SND_MTPAV=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AD1848_LIB=m
 CONFIG_SND_CS4231_LIB=m
 CONFIG_SND_ADLIB=m
@@ -2721,11 +2754,17 @@
 CONFIG_SND_PDAUDIOCF=m
 
 #
+# SoC audio support
+#
+CONFIG_SND_SOC=m
+
+#
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=m
-CONFIG_OSS_OBSOLETE_DRIVER=y
+CONFIG_OBSOLETE_OSS=y
 CONFIG_SOUND_BT878=m
+CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_EMU10K1=m
 CONFIG_MIDI_EMU10K1=y
 CONFIG_SOUND_FUSION=m
@@ -2770,6 +2809,12 @@
 CONFIG_SOUND_KAHLUA=m
 
 #
+# HID devices
+#
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -2839,6 +2884,7 @@
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_ZEROPLUS_FF=y
@@ -2864,6 +2910,7 @@
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 
 #
 # USB Imaging devices
@@ -2881,6 +2928,7 @@
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2891,6 +2939,7 @@
 CONFIG_USB_BELKIN=y
 CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_MON=y
@@ -2966,6 +3015,7 @@
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
@@ -2984,6 +3034,7 @@
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
 
 #
 # USB DSL modem support
@@ -3092,7 +3143,9 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -3125,6 +3178,7 @@
 #
 # RTC interfaces
 #
+CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
@@ -3164,6 +3218,15 @@
 CONFIG_INTEL_IOATDMA=m
 
 #
+# Auxiliary Display support
+#
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -3463,6 +3526,7 @@
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_SERPENT=m
@@ -3481,10 +3545,12 @@
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CAMELLIA=m
 
 #
 # Hardware crypto devices

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.163.2.2 SOURCES/kernel-i386.config:1.82.10.163.2.3
--- SOURCES/kernel-i386.config:1.82.10.163.2.2	Wed Mar 28 00:57:19 2007
+++ SOURCES/kernel-i386.config	Mon May  7 16:16:04 2007
@@ -10,6 +10,8 @@
 #
 # Processor type and features
 #
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_SMP is not set
 # CONFIG_PARAVIRT is not set
 
@@ -131,6 +133,7 @@
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -138,11 +141,13 @@
 CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_BAY=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_IBM=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_IBM_BAY=y
 CONFIG_ACPI_TOSHIBA=m
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -201,6 +206,7 @@
 CONFIG_X86_CPUFREQ_NFORCE2=m
 CONFIG_X86_LONGRUN=m
 CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
 
 #
 # shared options
@@ -250,9 +256,11 @@
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set

================================================================
Index: SOURCES/kernel-i386-smp.config
diff -u SOURCES/kernel-i386-smp.config:1.59.10.154.2.2 SOURCES/kernel-i386-smp.config:1.59.10.154.2.3
--- SOURCES/kernel-i386-smp.config:1.59.10.154.2.2	Wed Mar 28 00:57:20 2007
+++ SOURCES/kernel-i386-smp.config	Mon May  7 16:16:04 2007
@@ -10,6 +10,8 @@
 #
 # Processor type and features
 #
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_SMP=y
 # CONFIG_PARAVIRT is not set
 
@@ -132,6 +134,7 @@
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -139,11 +142,13 @@
 CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_BAY=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_IBM=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_IBM_BAY=y
 CONFIG_ACPI_TOSHIBA=m
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -202,6 +207,7 @@
 CONFIG_X86_CPUFREQ_NFORCE2=m
 CONFIG_X86_LONGRUN=m
 CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
 
 #
 # shared options
@@ -251,9 +257,11 @@
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set

================================================================
Index: SOURCES/kernel-netfilter.config
diff -u SOURCES/kernel-netfilter.config:1.34.2.63.4.2 SOURCES/kernel-netfilter.config:1.34.2.63.4.3
--- SOURCES/kernel-netfilter.config:1.34.2.63.4.2	Wed Mar 28 00:57:20 2007
+++ SOURCES/kernel-netfilter.config	Mon May  7 16:16:04 2007
@@ -18,6 +18,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
@@ -31,6 +32,7 @@
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -86,7 +88,8 @@
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-# CONFIG_IP_NF_MATCH_AH is not set
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_MH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
@@ -137,7 +140,8 @@
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-# CONFIG_IP6_NF_MATCH_AH is not set
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m

================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.2 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.3
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.2	Thu Feb  1 00:48:55 2007
+++ SOURCES/kernel-ppc.config	Mon May  7 16:16:04 2007
@@ -131,9 +131,11 @@
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set

================================================================
Index: SOURCES/kernel-ppc-smp.config
diff -u SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.2 SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.3
--- SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.2	Thu Feb  1 00:53:53 2007
+++ SOURCES/kernel-ppc-smp.config	Mon May  7 16:16:04 2007
@@ -130,9 +130,11 @@
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set

================================================================
Index: SOURCES/kernel-sparc64.config
diff -u SOURCES/kernel-sparc64.config:1.48.2.121.4.1 SOURCES/kernel-sparc64.config:1.48.2.121.4.2
--- SOURCES/kernel-sparc64.config:1.48.2.121.4.1	Sat Jan 27 14:07:40 2007
+++ SOURCES/kernel-sparc64.config	Mon May  7 16:16:04 2007
@@ -2667,9 +2667,11 @@
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_MUTEXES=y

================================================================
Index: SOURCES/kernel-sparc64-smp.config
diff -u SOURCES/kernel-sparc64-smp.config:1.48.2.136.4.1 SOURCES/kernel-sparc64-smp.config:1.48.2.136.4.2
--- SOURCES/kernel-sparc64-smp.config:1.48.2.136.4.1	Sat Jan 27 14:07:40 2007
+++ SOURCES/kernel-sparc64-smp.config	Mon May  7 16:16:04 2007
@@ -2678,9 +2678,11 @@
 CONFIG_ENABLE_MUST_CHECK=y
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.169.4.1&r2=1.30.6.3.2.169.4.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-alpha-smp.config?r1=1.33.10.176.4.1&r2=1.33.10.176.4.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-common.config?r1=1.1.2.3&r2=1.1.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.163.2.2&r2=1.82.10.163.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.154.2.2&r2=1.59.10.154.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.63.4.2&r2=1.34.2.63.4.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.206.4.2&r2=1.3.2.3.2.2.2.206.4.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.206.4.2&r2=1.6.4.1.2.206.4.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.121.4.1&r2=1.48.2.121.4.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc64-smp.config?r1=1.48.2.136.4.1&r2=1.48.2.136.4.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.135.4.4&r2=1.37.2.135.4.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc-smp.config?r1=1.9.2.6.2.103.4.2&r2=1.9.2.6.2.103.4.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.137.2.2&r2=1.1.2.137.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.137.2.2&r2=1.1.2.137.2.3&f=u



More information about the pld-cvs-commit mailing list