pop

diff --git a/meta b/meta
index e10c0dab7afa82bfed1a6104fc42a2ce6576f846..3f211120a3005c04b61802f8edb5080062043e76 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 2d30c5c9e7a55328413d50e842588944be926fb4
-Head: faeb36860e2dcc00ba9bd6d012f16b2ac91900d7
+Previous: 51f1c67fb97a8dfbe557b7076cc0b92bdbbc99cc
+Head: fe0070e294ecb189fbf38d62a27f0d765e9cb9ca
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -17,8 +17,8 @@ Applied:
   resolve_af_ib: 1e48a78e279147c6b49e067f70d831b92171b722
   get_sid: a39f80e238bbf15eafc1846b862c67de2ad50e97
   whitespace: faeb36860e2dcc00ba9bd6d012f16b2ac91900d7
+  priv_data: fe0070e294ecb189fbf38d62a27f0d765e9cb9ca
 Unapplied:
-  priv_data: 4e1cfb66dc12b3d0099e7ae66003f5d7a049fc84
   listen_ib: d7a4519d30d517614f406fd589bd688c66e3ae1a
   query_addr: 0257cc9298aa70c4bfc1a8c393f970375a897825
   sa_pack_path: 8cbf269680fb08029075c8288f543d7105708e8f

diff --git a/patches/priv_data b/patches/priv_data
index d1e878c5f1d390c01e289f6c27f1ed0e5d7f4d1e..69254c1122f4aabbb5dbb30cefb1c6776ae469ac 100644 (file)
--- a/patches/priv_data
+++ b/patches/priv_data
@@ -1,5 +1,5 @@
-Bottom: e1f1268d0c046919cad2e8914e1a5932d794a868
-Top:    1e5717477c95ec86070b01d983de5099c4a4fa0e
+Bottom: 7e1b4654249758f35bfd766796eb48453d393b5b
+Top:    7a0df9ea8f31831e5241634f01b8539c670e24c1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:35 -0700
 
@@ -19,10 +19,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
-index 3212604..785b06c 100644
+index cabcd5e..635ff49 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -828,6 +828,7 @@ static inline int cma_user_data_offset(enum rdma_port_space ps)
+@@ -829,6 +829,7 @@ static inline int cma_user_data_offset(enum rdma_port_space ps)
  {
        switch (ps) {
        case RDMA_PS_SDP:
@@ -30,7 +30,7 @@ index 3212604..785b06c 100644
                return 0;
        default:
                return sizeof(struct cma_hdr);
-@@ -2357,19 +2358,19 @@ err1:
+@@ -2359,19 +2360,19 @@ err1:
  }
  EXPORT_SYMBOL(rdma_bind_addr);
  
@@ -56,7 +56,7 @@ index 3212604..785b06c 100644
                case RDMA_PS_SDP:
                        sdp_hdr = hdr;
                        if (sdp_get_majv(sdp_hdr->sdp_version) != SDP_MAJ_VERSION)
-@@ -2388,13 +2389,14 @@ static int cma_format_hdr(void *hdr, enum rdma_port_space ps,
+@@ -2390,13 +2391,14 @@ static int cma_format_hdr(void *hdr, enum rdma_port_space ps,
                        cma_hdr->port = src4->sin_port;
                        break;
                }
@@ -75,7 +75,7 @@ index 3212604..785b06c 100644
                case RDMA_PS_SDP:
                        sdp_hdr = hdr;
                        if (sdp_get_majv(sdp_hdr->sdp_version) != SDP_MAJ_VERSION)
-@@ -2481,20 +2483,20 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
+@@ -2483,20 +2485,20 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
  {
        struct ib_cm_sidr_req_param req;
        struct rdma_route *route;
@@ -101,7 +101,7 @@ index 3212604..785b06c 100644
        if (ret)
                goto out;
  
-@@ -2548,7 +2550,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
+@@ -2550,7 +2552,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
        }
  
        route = &id_priv->id.route;