pop

diff --git a/meta b/meta
index 8a0348dc41ffcd047dce22af012a239495ac7f41..388f31e23fbc945d8cc8d721fc23704d07a72710 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b0c5c0ad681395f485b233f82b07abab94338529
-Head: 2128e1c4feee2dd0117962223034e39d2762ea9c
+Previous: 2796c5a2f682e3ecd2cc69218f28cf9f8a35134f
+Head: 259e7f992a5f53a659ed59a1e3153ee1ccb40405
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
@@ -8,7 +8,7 @@ Applied:
   xrc_qp: db63132ca115254044900ae234e123e8c963e8ee
   open_qp: 62f82b2b6f0a5e44b9051558844fb4e381eacad5
   open_qp_man: 2128e1c4feee2dd0117962223034e39d2762ea9c
+  xrc_sample: 259e7f992a5f53a659ed59a1e3153ee1ccb40405
 Unapplied:
   compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43
-  xrc_sample: f94ad65642aa4d25a276430855da3d3c55b91492
 Hidden:

diff --git a/patches/xrc_sample b/patches/xrc_sample
index 883fc4cb15929fe0c9e1b2f625d26cf32a5f664d..487122fc666003c7e208a37aef40e4e96f53fb10 100644 (file)
--- a/patches/xrc_sample
+++ b/patches/xrc_sample
@@ -1,5 +1,5 @@
-Bottom: 919ce71103cdba96b941c0e4e8a5ee84024d2684
-Top:    ee745051ab4aa39422601e48ea4aca2dfadc3aa5
+Bottom: 02e7065855e6566270aebfa0bee48216b818df68
+Top:    be7c92b8180cedfd84d9d95b285da5178d881461
 Author: Jay Sternberg <jay.e.sternberg@intel.com>
 Date:   2012-09-19 14:46:28 -0700
 
@@ -12,7 +12,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 1cfb008..939b9d2 100644
+index cd00a65..4821ec6 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -18,7 +18,7 @@ src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map