Merge branch 'ofed_1_2' into connectx

Conflicts:

	OFED_release_notes.txt
	ofed.conf-example

diff --cc OFED_Installation_Guide.txt
Simple merge

diff --cc OFED_release_notes.txt
index 3d3a5e0a34dd451bdea5be10ac8e93d52e3e1f81,d6acf65592ba0f01480408dda390136e7ab6dae3..1a341ea86be484c6b5befc244a754f0baa31b008
--- 1/OFED_release_notes.txt
--- 2/OFED_release_notes.txt
+++ b/OFED_release_notes.txt
@@@ -41,9 -36,11 +41,11 @@@ Important notes: 
  ---------------------
  The OFED package contains the following components:
    o   OpenFabrics core and ULPs:
-         - HCA drivers (mthca, mlx4, ipath, ehca)
 -        - IB HCA drivers (mthca, ipath, ehca)
++        - IB HCA drivers (mthca, mlx4, ipath, ehca)
+       - iWARP RNIC driver (cxgb3)
          - core
-         - Upper Layer Protocols: IPoIB, SDP, SRP Initiator, iSER Host and uDAPL
+         - Upper Layer Protocols: IPoIB, SDP, SRP Initiator, iSER Host, RDS, 
+         uDAPL and VNIC.
    o   OpenFabrics utilities:
          - OpenSM (OSM): InfiniBand Subnet Manager
          - Diagnostic tools
@@@ -57,30 -58,41 +63,40 @@@
    o   Documentation
  
  Notes:
 -1. cxgb3 driver is in technology preview state.
 -2. The Virtual NIC (VNIC) driver is presented as a technology preview on OFED 1.2.
 -3. All other OFED components are of production quality.
 -4. See release notes for each package in the docs directory.
 -5. Any Topspin copyright belongs to Cisco Systems, Inc.
 -
 +1. mlx4 driver is in alpha quality: Only OpenSM, MPI and IPoIB can be used. 
- 2. See release notes for each package in the docs directory.
- 3. Any Topspin copyright belongs to Cisco Systems, Inc.
++2. cxgb3 driver is in technology preview state.
++3. The Virtual NIC (VNIC) driver is presented as a technology preview on OFED 1.2.
++4. All other OFED components are of production quality.
++5. See release notes for each package in the docs directory.
++6. Any Topspin copyright belongs to Cisco Systems, Inc.
  
  1.2 Supported Platforms and Operating Systems
  ---------------------------------------------
    o   CPU architectures:
        - x86_64
 -      - x86
 -      - ia64
+       - ppc64
++      - x86
        
    o   Linux Operating Systems:
-       - RedHat EL5: 2.6.18-8.el5
+       - RedHat EL4 up3: 2.6.9-34.ELsmp
+       - RedHat EL4 up4: 2.6.9-42.ELsmp
+       - RedHat EL4 up5: 2.6.9-42.ELsmp
+       - RedHat EL5: 2.6.9-42.ELsmp
 -      - SLES9 SP3: 2.6.5-7.244-smp
        - SLES10: 2.6.16.21-0.8-smp
 -      - kernel.org: 2.6.19.x and 2.6.20.x
++      - kernel.org: 2.6.20.x
        
- 1.3 HCAs Supported
- ------------------
- This release supports HCAs by Mellanox Technologies, Qlogic and IBM.
+ 1.3 HCAs and RNICs Supported
+ ----------------------------
+ This release supports IB HCAs by Mellanox Technologies, Qlogic and IBM as
+ well as iWARP RNICs by Chelsio Communications.
  
    o   Mellanox Technologies HCAs:
        - InfiniHost (fw-23108 Rev 3.5.000)
-       - InfiniHost III Ex (MemFree: fw-25218 Rev 5.1.400 
-                            with memory: fw-25208 Rev 4.7.600)
+       - InfiniHost III Ex (MemFree: fw-25218 Rev 5.2.000 
+                            with memory: fw-25208 Rev 4.8.200)
        - InfiniHost III Lx (fw-25204 Rev 1.2.000)
        The SDR and DDR modes of the InfiniHost III family are supported.
-       - ConnectX IB (fw-25408 Rev 2.0.150)
++      - ConnectX IB (fw-25408 Rev 2.0.156)
  
        For official firmware versions please see:
        http://www.mellanox.com/support/firmware_table.php
@@@ -112,6 -128,12 +132,11 @@@ The following third party packages hav
  1.6 OFED Sources:
  -----------------
  Source repositories: 
 -http://www.openfabrics.org/git/
+ Kernel sources: ~vlad/ofed_1_2/.git
+ User level Sources are located in all git trees starting with: ofed_1_2/ 
+ 
+ The kernel sources are based on Linux 2.6.20 mainline kernel. Its patches
+ are included in the OFED sources directory.
  For details see HOWTO.build_ofed.
  
  

diff --cc README.txt
Simple merge

diff --cc ofed.conf-example
Simple merge