pop

diff --git a/meta b/meta
index d31610888fedadf27cd433f9c2617da0f3f57177..4dd4536a7d52e0c7cbc7c4c1cc51692569bccfec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: e7bb3bba23e2f32a09802ee00a278da449f09084
-Head: 9f25d83861922ca4b4842c1d81359239c15b0575
+Previous: bcb97239f3f909147738887b2afef871e83d3375
+Head: 15cd6383ad5db6dea95ed7e25101a3270d2cfb83
 Applied:
   rs2: 9f25d83861922ca4b4842c1d81359239c15b0575
+  rs3: 15cd6383ad5db6dea95ed7e25101a3270d2cfb83
 Unapplied:
   rs1: 110fcad2ecce39d6888448c19b08791ea193e7f9
-  rs3: 9fb978ede0b7b548b7954f01097af337b938020c
   rs4: d1067d98830663fc9a95f6c9a502ac62d8e995a0
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511

diff --git a/patches/rs3 b/patches/rs3
index 7b4a40293895c725e55cc89e5b7be48aedccf356..6a63ff697d41fc8809dc53e1f2440117704cca8e 100644 (file)
--- a/patches/rs3
+++ b/patches/rs3
@@ -1,5 +1,5 @@
-Bottom: e8942df497cda9d853e5bbaa69226ad2ede0b3b9
-Top:    9a355c4fd6adc489cc0c3c07b3d436d25ff2cb0c
+Bottom: 69d5a78d671e7db0e0da70e3702c92eceac177a8
+Top:    e82c044cf309455824c63dc15e3d4af71448cf16
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-04 14:51:41 -0700
 
@@ -69,7 +69,7 @@ index 2ee4767..cedc0c3 100644
 +
  #endif /* CMA_H */
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 2fd106a..d7344c7 100644
+index e906fd4..7692498 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -37,10 +37,12 @@