refresh (create temporary patch)

diff --git a/meta b/meta
index 7b8b64eb7ae6b0659f124ea4581b1b7fe03af061..50487cae372b90e3ca09dcc77e36291e9114f04b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 857448605cba0c4440d280caece3b19ca57a7372
-Head: b322dee7d6472ac1c30801cf64b11ae37da2940d
+Previous: b6d78a756b024e4b05b2eaa0e8dac6d36b842d96
+Head: 65679a87ad5c21df4d5c96e21bbf5b0b7f1b0f00
 Applied:
   verbs-ext: e3d312ae562579568c8941c4a9851a8b210eb70f
   xrcd: b322dee7d6472ac1c30801cf64b11ae37da2940d
+  refresh-temp: 65679a87ad5c21df4d5c96e21bbf5b0b7f1b0f00
 Unapplied:
   srq_ex: 556e5c240973dd4d4fac250694525ab3211bd604
   xrc_qp: 092bcc697d9bb0d4fe8cc322d57b9248800d2e71

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c228076
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,100 @@
+Bottom: 251be489f83c1d199a2d939a5971c651eddb84c4
+Top:    f3f8e633898e3c7505ac27460a3b12095f8911cf
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-09-28 12:12:01 -0700
+
+Refresh of xrcd
+
+---
+
+diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
+index 353be97..bee4ccc 100644
+--- a/include/infiniband/verbs.h
++++ b/include/infiniband/verbs.h
+@@ -58,19 +58,19 @@
+ BEGIN_C_DECLS
+ 
+ union ibv_gid {
+-      uint8_t raw[16];
++      uint8_t                 raw[16];
+       struct {
+-              uint64_t subnet_prefix;
+-              uint64_t interface_id;
++              uint64_t        subnet_prefix;
++              uint64_t        interface_id;
+       } global;
+ };
+ 
+ #ifndef container_of
+ /**
+  * container_of - cast a member of a structure out to the containing structure
+- * @ptr:        the pointer to the member.
+- * @type:       the type of the container struct this is embedded in.
+- * @member:     the name of the member within the struct.
++ * @ptr:      the pointer to the member.
++ * @type:     the type of the container struct this is embedded in.
++ * @member:   the name of the member within the struct.
+  *
+  */
+ #define container_of(ptr, type, member) ({\
+@@ -79,37 +79,41 @@ union ibv_gid {
+ #endif
+ 
+ enum ibv_node_type {
+-      IBV_NODE_UNKNOWN = -1,
+-      IBV_NODE_CA = 1,
++      IBV_NODE_UNKNOWN        = -1,
++      IBV_NODE_CA             = 1,
+       IBV_NODE_SWITCH,
+       IBV_NODE_ROUTER,
+       IBV_NODE_RNIC
+ };
+ 
+ enum ibv_transport_type {
+-      IBV_TRANSPORT_UNKNOWN = -1, IBV_TRANSPORT_IB = 0, IBV_TRANSPORT_IWARP
++      IBV_TRANSPORT_UNKNOWN   = -1,
++      IBV_TRANSPORT_IB        = 0,
++      IBV_TRANSPORT_IWARP
+ };
+ 
+ enum ibv_device_cap_flags {
+-      IBV_DEVICE_RESIZE_MAX_WR = 1,
+-      IBV_DEVICE_BAD_PKEY_CNTR = 1 << 1,
+-      IBV_DEVICE_BAD_QKEY_CNTR = 1 << 2,
+-      IBV_DEVICE_RAW_MULTI = 1 << 3,
+-      IBV_DEVICE_AUTO_PATH_MIG = 1 << 4,
+-      IBV_DEVICE_CHANGE_PHY_PORT = 1 << 5,
+-      IBV_DEVICE_UD_AV_PORT_ENFORCE = 1 << 6,
+-      IBV_DEVICE_CURR_QP_STATE_MOD = 1 << 7,
+-      IBV_DEVICE_SHUTDOWN_PORT = 1 << 8,
+-      IBV_DEVICE_INIT_TYPE = 1 << 9,
+-      IBV_DEVICE_PORT_ACTIVE_EVENT = 1 << 10,
+-      IBV_DEVICE_SYS_IMAGE_GUID = 1 << 11,
+-      IBV_DEVICE_RC_RNR_NAK_GEN = 1 << 12,
+-      IBV_DEVICE_SRQ_RESIZE = 1 << 13,
+-      IBV_DEVICE_N_NOTIFY_CQ = 1 << 14
++      IBV_DEVICE_RESIZE_MAX_WR        = 1,
++      IBV_DEVICE_BAD_PKEY_CNTR        = 1 << 1,
++      IBV_DEVICE_BAD_QKEY_CNTR        = 1 << 2,
++      IBV_DEVICE_RAW_MULTI            = 1 << 3,
++      IBV_DEVICE_AUTO_PATH_MIG        = 1 << 4,
++      IBV_DEVICE_CHANGE_PHY_PORT      = 1 << 5,
++      IBV_DEVICE_UD_AV_PORT_ENFORCE   = 1 << 6,
++      IBV_DEVICE_CURR_QP_STATE_MOD    = 1 << 7,
++      IBV_DEVICE_SHUTDOWN_PORT        = 1 << 8,
++      IBV_DEVICE_INIT_TYPE            = 1 << 9,
++      IBV_DEVICE_PORT_ACTIVE_EVENT    = 1 << 10,
++      IBV_DEVICE_SYS_IMAGE_GUID       = 1 << 11,
++      IBV_DEVICE_RC_RNR_NAK_GEN       = 1 << 12,
++      IBV_DEVICE_SRQ_RESIZE           = 1 << 13,
++      IBV_DEVICE_N_NOTIFY_CQ          = 1 << 14
+ };
+ 
+ enum ibv_atomic_cap {
+-      IBV_ATOMIC_NONE, IBV_ATOMIC_HCA, IBV_ATOMIC_GLOB
++      IBV_ATOMIC_NONE,
++      IBV_ATOMIC_HCA,
++      IBV_ATOMIC_GLOB
+ };
+ 
+ struct ibv_device_attr {