pop

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

diff --git a/patches/rs4 b/patches/rs4
index 6300c80012ddeb801b4ec7cd0b41182f8281028a..4125412078525242fb3884440ba209ad71d70908 100644 (file)
--- a/patches/rs4
+++ b/patches/rs4
@@ -1,5 +1,5 @@
-Bottom: 9a355c4fd6adc489cc0c3c07b3d436d25ff2cb0c
-Top:    12cda031f6e4027c6df650d4c84ed637ba93cdf8
+Bottom: e82c044cf309455824c63dc15e3d4af71448cf16
+Top:    19653040b4f6827e46b2b5079ab41e32a223fc76
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-05 15:28:18 -0700
 
@@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index d7344c7..5e0e413 100644
+index 7692498..a3c2c6a 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -53,19 +53,20 @@