refresh

diff --git a/meta b/meta
index 1bde6bb826630669e97b9731b2c071c87ddad80b..18ac7e48fce8dd3e54cf397936ec14a2f609c9fd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 71dcbb0ad0c0ff62b8ecd5dceeed7814d60656a5
-Head: 709c199fbda6069b7edc5131cfb0c59c1a9e7131
+Previous: 3af9ca2658c52d8f2ef50e6fc4b9362cafcedce8
+Head: 22a27cbc8c17e08322878c0b84167c75dde413d2
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -8,8 +8,7 @@ Applied:
   opt-cq: eb08384598a3829b40cc525aa2871e4e96817507
   max-rdma: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
-  gai: 3a732c7b1faeb0bb06b7f6ae9cf1cfca2f100353
-  refresh-temp: 709c199fbda6069b7edc5131cfb0c59c1a9e7131
+  gai: 22a27cbc8c17e08322878c0b84167c75dde413d2
 Unapplied:
   getreq: 4c50d78bc73685574548b3a781e914472b34a2cf
   ep: 1d456022a217a651dce3bd33963ce7e60328cb0f

diff --git a/patches/gai b/patches/gai
index ec817c49e935264c594fd7dc2caa66945d683170..27739c538b0c476f7e0578d2585d6c7d97d072ed 100644 (file)
--- a/patches/gai
+++ b/patches/gai
@@ -1,5 +1,5 @@
 Bottom: 5a4bd54fa45c17ca116710f00c36a7a09b2b37db
-Top:    26c28fccf32c564d326dfb53a57a5951e469e12a
+Top:    56e98b8b077817b4af2ad424863deb09e4c52197
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 10:05:05 -0700
 
@@ -56,7 +56,7 @@ index 294a75b..2ef2868 100644
  int rdmaw_wsa_errno(int wsa_err);\r
  \r
 diff --git a/trunk/ulp/librdmacm/src/Sources b/trunk/ulp/librdmacm/src/Sources
-index 6a8418a..4a98afa 100644
+index 6a8418a..4934f04 100644
 --- a/trunk/ulp/librdmacm/src/Sources
 +++ b/trunk/ulp/librdmacm/src/Sources
 @@ -19,7 +19,8 @@ USE_MSVCRT = 1
@@ -65,7 +65,7 @@ index 6a8418a..4a98afa 100644
        cma_main.cpp    \\r
 -      cma.cpp\r
 +      cma.cpp                 \\r
-+      addrinfo.c\r
++      addrinfo.cpp\r
  \r
  INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include;\\r
                   ..\..\..\inc\user\linux;\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 58f282e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 26c28fccf32c564d326dfb53a57a5951e469e12a
-Top:    56e98b8b077817b4af2ad424863deb09e4c52197
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 12:08:40 -0700
-
-Refresh of gai
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/Sources b/trunk/ulp/librdmacm/src/Sources
-index 4a98afa..4934f04 100644
---- a/trunk/ulp/librdmacm/src/Sources
-+++ b/trunk/ulp/librdmacm/src/Sources
-@@ -20,7 +20,7 @@ SOURCES =                    \
-       cma.rc                  \\r
-       cma_main.cpp    \\r
-       cma.cpp                 \\r
--      addrinfo.c\r
-+      addrinfo.cpp\r
- \r
- INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include;\\r
-                  ..\..\..\inc\user\linux;