Branch b_release_1_4_6

Revert suse kernel update for now, since it doesn't work on Boston (upstream
issue, not ours.)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
index 9971cfa..1718e49 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
@@ -67,6 +67,7 @@ CONFIG_STOP_MACHINE=y
 #
 # Processor type and features
 #
+CONFIG_MEM_MIRROR=y
 # CONFIG_X86_PC is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -130,8 +131,6 @@ CONFIG_X86_CPUID=m
 # Firmware Drivers
 #
 CONFIG_EDD=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
@@ -611,7 +610,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -669,7 +667,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -732,10 +729,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -938,9 +932,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -1203,7 +1194,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1212,7 +1202,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1815,9 +1804,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 CONFIG_IPMI_PANIC_STRING=y
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1877,13 +1865,6 @@ CONFIG_SONYPI=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=m
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
@@ -1985,7 +1966,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
index 9971cfa..1718e49 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
@@ -67,6 +67,7 @@ CONFIG_STOP_MACHINE=y
 #
 # Processor type and features
 #
+CONFIG_MEM_MIRROR=y
 # CONFIG_X86_PC is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -130,8 +131,6 @@ CONFIG_X86_CPUID=m
 # Firmware Drivers
 #
 CONFIG_EDD=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
@@ -611,7 +610,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -669,7 +667,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -732,10 +729,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -938,9 +932,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -1203,7 +1194,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1212,7 +1202,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1815,9 +1804,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 CONFIG_IPMI_PANIC_STRING=y
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1877,13 +1865,6 @@ CONFIG_SONYPI=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=m
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
@@ -1985,7 +1966,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
index 9971cfa..1718e49 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
@@ -67,6 +67,7 @@ CONFIG_STOP_MACHINE=y
 #
 # Processor type and features
 #
+CONFIG_MEM_MIRROR=y
 # CONFIG_X86_PC is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -130,8 +131,6 @@ CONFIG_X86_CPUID=m
 # Firmware Drivers
 #
 CONFIG_EDD=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
@@ -611,7 +610,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -669,7 +667,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -732,10 +729,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -938,9 +932,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -1203,7 +1194,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1212,7 +1202,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1815,9 +1804,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 CONFIG_IPMI_PANIC_STRING=y
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1877,13 +1865,6 @@ CONFIG_SONYPI=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=m
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
@@ -1985,7 +1966,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
index c205dc4..2a42807 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
@@ -93,7 +93,6 @@ CONFIG_IA64_SGI_SN_XPC=m
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_SMP=y
 CONFIG_NR_CPUS=128
-CONFIG_SCHED_SMT=y
 # CONFIG_PREEMPT is not set
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_IA32_SUPPORT=y
@@ -440,7 +439,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -484,7 +482,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -523,10 +520,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -729,9 +723,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -951,7 +942,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -960,7 +950,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1500,9 +1489,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 CONFIG_IPMI_PANIC_STRING=y
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1537,13 +1525,6 @@ CONFIG_APPLICOM=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=m
 CONFIG_AGP_I460=m
 CONFIG_AGP_HP_ZX1=m
@@ -1631,7 +1612,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 # CONFIG_SENSORS_W83L785TS is not set
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
index c205dc4..2a42807 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
@@ -93,7 +93,6 @@ CONFIG_IA64_SGI_SN_XPC=m
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_SMP=y
 CONFIG_NR_CPUS=128
-CONFIG_SCHED_SMT=y
 # CONFIG_PREEMPT is not set
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_IA32_SUPPORT=y
@@ -440,7 +439,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -484,7 +482,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -523,10 +520,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -729,9 +723,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -951,7 +942,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -960,7 +950,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1500,9 +1489,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 CONFIG_IPMI_PANIC_STRING=y
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1537,13 +1525,6 @@ CONFIG_APPLICOM=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=m
 CONFIG_AGP_I460=m
 CONFIG_AGP_HP_ZX1=m
@@ -1631,7 +1612,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 # CONFIG_SENSORS_W83L785TS is not set
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
index 81f3823..c455f9d 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
@@ -84,13 +84,6 @@ CONFIG_X86_GOOD_APIC=y
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
 CONFIG_X86_HT=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
@@ -503,7 +496,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -551,7 +543,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -590,10 +581,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -799,9 +787,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -1014,7 +999,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1023,7 +1007,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1511,9 +1494,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 # CONFIG_IPMI_PANIC_STRING is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1564,16 +1546,8 @@ CONFIG_APPLICOM=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
 CONFIG_AGP_INTEL_MCH=m
 # CONFIG_DRM is not set
 
@@ -1659,7 +1633,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support
@@ -1790,8 +1763,6 @@ CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
index 81f3823..c455f9d 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
@@ -84,13 +84,6 @@ CONFIG_X86_GOOD_APIC=y
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
 CONFIG_X86_HT=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
@@ -503,7 +496,6 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -551,7 +543,6 @@ CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA2XXX_FAILOVER=y
 CONFIG_SCSI_QLA4XXX=m
@@ -590,10 +581,7 @@ CONFIG_BLK_DEV_DM_BBR=m
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -799,9 +787,6 @@ CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
 
 #
 # IPv6: Netfilter Configuration
@@ -1014,7 +999,6 @@ CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 CONFIG_NET_BROADCOM=m
 CONFIG_NET_BCM44=m
-CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1023,7 +1007,6 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1511,9 +1494,8 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_PANIC_EVENT=y
 # CONFIG_IPMI_PANIC_STRING is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
+CONFIG_IPMI_KCS=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
 
 #
 # Watchdog Cards
@@ -1564,16 +1546,8 @@ CONFIG_APPLICOM=m
 #
 # Ftape, the floppy tape device driver
 #
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
 CONFIG_AGP_INTEL_MCH=m
 # CONFIG_DRM is not set
 
@@ -1659,7 +1633,6 @@ CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_PCF8574=m
 
 #
 # Other I2C Chip support
@@ -1790,8 +1763,6 @@ CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
index a0a2633..d604f6e 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-suse.target.in
+++ b/lustre/kernel_patches/targets/2.6-suse.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.5"
-lnxrel="7.244"
+lnxrel="7.201"
 
 KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2
 # they include our patches