From a0518d7f91e0d219719479ca2745c0124c0041c5 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 9 Oct 2012 09:56:11 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/2-5-librdmacm-rsocket-added-mi | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta b/meta index 02c05832..9f0f490c 100644 --- a/meta +++ b/meta @@ -1,10 +1,10 @@ Version: 1 -Previous: 5d7517d769b7f3bc4e4904bd7b15169613cd4a77 -Head: eddbe8f0abc3d0f69755f0e510df2a7f21412c0b +Previous: f01053249b0014b2c6f1d3b2bb2d0e343fc0d7b5 +Head: 206b167ee98700cc8dad709390372331cc94b1d6 Applied: 1-5-librdmacm-rsocket-add-miss: eddbe8f0abc3d0f69755f0e510df2a7f21412c0b + 2-5-librdmacm-rsocket-added-mi: 206b167ee98700cc8dad709390372331cc94b1d6 Unapplied: - 2-5-librdmacm-rsocket-added-mi: 6841eb657a1999eb0b9fe868ef655c3176458172 3-5-librdmacm-rstream-initiali: 6edbcb82d7a5345c2337472285f2015501562dae 4-5-librdmacm-rstream-added-mi: 9b1271effaff9251b5d331167e6cf820fc082f69 5-5-librdmacm-rping-added-chec: 62a796f72dbcb7cd08124f4a2b96bef75a803a9a diff --git a/patches/2-5-librdmacm-rsocket-added-mi b/patches/2-5-librdmacm-rsocket-added-mi index e3ea1767..e85d417e 100644 --- a/patches/2-5-librdmacm-rsocket-added-mi +++ b/patches/2-5-librdmacm-rsocket-added-mi @@ -1,5 +1,5 @@ -Bottom: f645979e703e3337aa2e7456b7e1742bc602ce6a -Top: 39eb51ceb9f5ecf9dded46d0c3dd62f5e135e41d +Bottom: 145c31a6954c193a2ed1d3716d0fb4db0b11cd14 +Top: 0532a4014e54d2df96b1b5cbd60e1bca852de751 Author: Dotan Barak Date: 2012-10-09 12:27:49 +0000 @@ -12,7 +12,7 @@ Reviewed-by: Yishai Hadas --- diff --git a/src/rsocket.c b/src/rsocket.c -index 278c8ec..4665ce7 100644 +index 5b65b12..cc5effe 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -1859,6 +1859,7 @@ int rsetsockopt(int socket, int level, int optname, -- 2.46.0