refresh (create temporary patch)

diff --git a/meta b/meta
index fc2e55769aecfe96a770dbf656fa4e48d24453d7..8dbf76db185057bccf069d14b5c4542bd2f59ed1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6f8f0964c78a6cec9facfedbce11747335b6a648
-Head: 684e1fe67558aa0c7d2cff2f8634866c435e7803
+Previous: 93f9749a93a784dfd06344df61aa886ee5783c39
+Head: 764e85fbd357d96e49c988b185b471160c787fe1
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
@@ -8,6 +8,7 @@ Applied:
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f
   rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab
   dbg: 684e1fe67558aa0c7d2cff2f8634866c435e7803
+  refresh-temp: 764e85fbd357d96e49c988b185b471160c787fe1
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..ee64553
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 552216c4c92cac1034077b23311e7374f0379b5d
+Top:    fc0d4fef187ee5bca74ac50c3bb7806917a0a428
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-19 16:02:26 -0700
+
+Refresh of dbg
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index e429ad6..47e1e64 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -491,6 +491,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+               return ret;
+ 
+       real.close(fd);
++      printf("connect_fork - connecting rsocket");
+       return rconnect(ret, addr, addrlen);
+ }
+ 
+@@ -901,6 +902,7 @@ pid_t fork(void)
+       copysockopts(dfd, sfd, &rs, &real);
+       real.shutdown(sfd, SHUT_RDWR);
+       real.close(sfd);
++      printf("fork - using rsocket\n");
+       fd_store(last_accept, dfd, fd_rsocket);
+ 
+ lclose: