From 560b235adc799fa710571ca63cbc3e4fa6374ff2 Mon Sep 17 00:00:00 2001
From: Arlin Davis <arlin.r.davis@intel.com>
Date: Mon, 11 Jan 2010 09:03:10 -0800
Subject: [PATCH] Release 2.0.26-1

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
---
 ChangeLog    | 43 +++++++++++++++++++++++++++++++++++++++++++
 configure.in |  4 ++--
 dapl.spec.in |  3 +++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45261a5..878e120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit 73dfb32ace6aff2fdb21e54689342fd551822286
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Tue Dec 22 14:00:33 2009 -0800
+
+    openib_common: add check for both gid and global routing in RTR
+    
+    check for valid gid pointer along with global route setting
+    during transition to RTR. Add more GID information to
+    debug print statement in qp modify call.
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
+commit 7aab18fd8ff3f201b0a4b6c76896667b29f103c4
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Fri Dec 4 12:31:22 2009 -0800
+
+    openib_common: remote memory read privilege set multi times
+    
+    duplicate setting of read privilege in dapls_convert_privileges
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
+commit 016e2c40b8ac2fe18993e9fb7122ecb9b439e5eb
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Fri Dec 4 12:25:30 2009 -0800
+
+    ucm, scm: DAPL_GLOBAL_ROUTING enabled causes segv
+    
+    socket cm and ud cm providers support QP modify with is_global
+    set and GRH. New v2 providers didn't pass GID information
+    in modify_qp RTR call and incorrectly byte swapped the already
+    network order GID. Add debug print of GID during global modify.
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
+commit 7b0c596c7b4ad619f65da9f79dcbc4376e651dde
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Tue Nov 24 22:16:58 2009 -0800
+
+    Release 2.0.25-1
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
 commit 3197bffff478ad7ff5eff9220fa0528e42e6b56e
 Author: Arlin Davis <arlin.r.davis@intel.com>
 Date:   Tue Nov 24 22:15:46 2009 -0800
diff --git a/configure.in b/configure.in
index c704145..ccf2405 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(dapl, 2.0.25, linux-rdma@vger.kernel.org)
+AC_INIT(dapl, 2.0.26, linux-rdma@vger.kernel.org)
 AC_CONFIG_SRCDIR([dat/udat/udat.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 2.0.25)
+AM_INIT_AUTOMAKE(dapl, 2.0.26)
 
 AM_PROG_LIBTOOL
 
diff --git a/dapl.spec.in b/dapl.spec.in
index ae20382..7a532b3 100644
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -140,6 +140,9 @@ fi
 %{_mandir}/man5/*.5*
 
 %changelog
+* Tue Jan 11 2010 Arlin Davis <ardavis@ichips.intel.com> - 2.0.26
+- DAT/DAPL Version 2.0.26 Release 1, OFED 1.5, OFED 1.5-RDMAoE  
+
 * Tue Nov 24 2009 Arlin Davis <ardavis@ichips.intel.com> - 2.0.25
 - DAT/DAPL Version 2.0.25 Release 1, OFED 1.5 RC3 
 
-- 
2.46.0