b=15316

i=cliffw
i=wangyb

Build OFED 1.3's kernel-ib and kernel-ib-devel with our patched lustre
server kernel for RHEL 4 and 5 and SLES 10.  SLES 9 is not supported by
OFED 1.3.
Since OFED 1.3 provides a newer open-iscsi stack, prefer those modules
from the kernel-ib over those provided by the vendor kernels.
Additionally, build Lustre with o2iblnd support.

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
index 77bc38f..a483ed5 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
@@ -1198,7 +1198,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1207,7 +1207,7 @@ CONFIG_ISCSI_TARGET=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m


@@ -1277,7 +1277,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m


@@ -3119,14 +3119,7 @@ CONFIG_MMC_WBSD=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND is not set

 
 #
 # DMA Engine support
 
 #
 # DMA Engine support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
index 2c071b6..b256f50 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
@@ -1198,7 +1198,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1207,7 +1207,7 @@ CONFIG_ISCSI_TARGET=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m


@@ -1277,7 +1277,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m


@@ -3119,14 +3119,7 @@ CONFIG_MMC_WBSD=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND is not set

 
 #
 # DMA Engine support
 
 #
 # DMA Engine support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
index ab3b905..2dfe4f6 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
@@ -1093,7 +1093,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1102,7 +1102,7 @@ CONFIG_ISCSI_TARGET=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -1156,7 +1156,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m


@@ -2696,14 +2696,7 @@ CONFIG_MMC_WBSD=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND is not set

 
 #
 # DMA Engine support
 
 #
 # DMA Engine support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
index d9a018d..8a43733 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
@@ -1074,7 +1074,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1083,7 +1083,7 @@ CONFIG_ISCSI_TARGET=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -1137,7 +1137,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m


@@ -2684,14 +2684,7 @@ CONFIG_MMC_WBSD=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND is not set

 
 #
 # DMA Engine support
 
 #
 # DMA Engine support

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config
index 16b233d..a451029 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config
@@ -1114,7 +1114,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1122,7 +1122,7 @@ CONFIG_SCSI_SAS_LIBSAS=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -1173,7 +1173,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set


@@ -1426,7 +1426,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m


@@ -2642,28 +2642,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-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=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config
index 057c857..e866d45 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config
@@ -911,7 +911,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -919,7 +919,7 @@ CONFIG_SCSI_SAS_LIBSAS=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -965,7 +965,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set


@@ -1203,7 +1203,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m


@@ -2327,29 +2327,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config
index d4e7b3c..2ffc74e 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config
@@ -904,7 +904,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -912,7 +912,7 @@ CONFIG_SCSI_SAS_LIBSAS=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -958,7 +958,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set


@@ -1197,7 +1197,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m


@@ -2324,29 +2324,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
index 10310a3..be86ee8 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
@@ -1060,7 +1060,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1068,7 +1068,7 @@ CONFIG_SCSI_SAS_LIBSAS=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -1117,7 +1117,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set


@@ -1365,7 +1365,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m


@@ -2547,29 +2547,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
index 226d890..99b4df7 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
@@ -1039,7 +1039,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set


@@ -1047,7 +1047,7 @@ CONFIG_SCSI_SAS_LIBSAS=m
 #
 # SCSI low-level drivers
 #
 #
 # SCSI low-level drivers
 #

-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set

 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m


@@ -1096,7 +1096,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m

-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_QLA_ISCSI is not set

 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_DC390T is not set


@@ -1345,7 +1345,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m


@@ -2531,29 +2531,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
index 3607fa2..be52d34 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
@@ -541,7 +541,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -1156,7 +1156,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -2168,27 +2168,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
index e0f9600..28f4a24 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
@@ -527,7 +527,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -1144,7 +1144,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -2176,27 +2176,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
index 157dcc2..6fab5b2 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
@@ -312,7 +312,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -873,7 +873,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -1751,28 +1751,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
index 2eb9678..0345fbe 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
@@ -312,7 +312,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -873,7 +873,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -1751,28 +1751,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
index dc48f86..72d0c0d 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
@@ -445,7 +445,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -1010,7 +1010,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -1922,28 +1922,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
index 51d30e0..00293e2 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
@@ -445,7 +445,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m

-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set

 
 #
 # SCSI low-level drivers
 
 #
 # SCSI low-level drivers


@@ -1010,7 +1010,7 @@ CONFIG_QLA3XXX=m
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 #
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y

-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set

 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_NETXEN_NIC=m


@@ -1922,28 +1922,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
 #
 # InfiniBand support
 #

-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=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=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_VNIC=m
-# CONFIG_INFINIBAND_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set

 
 #
 # EDAC - error detection and reporting (RAS)
 
 #
 # EDAC - error detection and reporting (RAS)

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index 390f959..c7226f6 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -9,6 +9,8 @@ RHBUILD=1
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 

+OFED_VERSION=1.3
+

 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index 6c39710..90df0f9 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -9,6 +9,8 @@ RHBUILD=1
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 

+OFED_VERSION=1.3
+

 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 35ddd85..95838df 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -19,6 +19,8 @@ LINUX26=1
 # No /boot/Kerntypes* in SLES10
 SUSEBUILD=0
 
 # No /boot/Kerntypes* in SLES10
 SUSEBUILD=0
 

+OFED_VERSION=1.3
+

 BASE_ARCHS="i686 ppc x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 BASE_ARCHS="i686 ppc x86_64 ia64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""