From 40a580b6b5af64420d0083275e03a2057c737a6e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 30 Jul 2013 18:37:17 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/rst-afib | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta b/meta index d6b4c4f8..5fa69fc0 100644 --- a/meta +++ b/meta @@ -1,9 +1,9 @@ Version: 1 -Previous: d671f1c3343921e5ce69ca08d4d4197bf2f0d5ee -Head: a8becf33bbbb363cb2e0f2b45456bc82b345c453 +Previous: 3b720142755124aa7f23c2d8039ac3d4cdd30d91 +Head: 34148679ac24e294b1157d24f240b09e8aa7603a Applied: + rst-afib: 34148679ac24e294b1157d24f240b09e8aa7603a Unapplied: - rst-afib: 83c2c70b91d4a93bbdd9bbec501de3a23e77a3bd ex-afib: c9db8cd19f07ddfaaa60772b43a6bdb11772d586 rs-setroute: 8c70df6c4c1bb675371e2207b076e57f3b4e6c99 stpath: 855be5ed7035f7edff35033cd9fa3fbfba96ab40 diff --git a/patches/rst-afib b/patches/rst-afib index a8e4b668..02eab3af 100644 --- a/patches/rst-afib +++ b/patches/rst-afib @@ -1,5 +1,5 @@ -Bottom: 4389e5ccd819a6d0803f1527aeca1074994ff4ce -Top: 68e89cf1610b4f73ee5afa33d14d24e0ce412529 +Bottom: 41e944da9e3a2e6f7aecde72a095aee914508844 +Top: 636749985960caf7dcd1f4533ce0afe96c6b360a Author: Sean Hefty Date: 2013-07-18 13:26:15 -0700 @@ -20,12 +20,12 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 04cddee..bba1093 100644 +index 33379cf..45bcb81 100644 --- a/src/acm.c +++ b/src/acm.c -@@ -115,18 +115,6 @@ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; +@@ -116,18 +116,6 @@ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; static int sock = -1; - static short server_port; + static uint16_t server_port; -struct ib_connect_hdr { - uint8_t cma_version; @@ -66,7 +66,7 @@ index e6fba8b..e944a9a 100644 #define SYSCONFDIR "/etc" #endif diff --git a/src/rsocket.c b/src/rsocket.c -index abdd392..6339c47 100644 +index ef24dfb..e2b1cc7 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -187,6 +187,16 @@ struct rs_conn_data { -- 2.46.0