refresh

diff --git a/meta b/meta
index 44ace35f7dbfd2d193b532c64dd73548aca99884..349deec7321d4e55f33b9baf973b8196e2da2299 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 11e2045f7b1242572d0154706bfa9a2130768275
-Head: bb35e39eb1183789d6aaf93457e35b56bf764419
+Previous: bcd31e73bf574ed972559f41a14425f71710a8bf
+Head: 8174a137121d14c0c6f9359e40b098990b357151
 Applied:
-  atomic: 5569c30cc5bd59bcd67f8471cabb6f4f06fe03be
-  refresh-temp: bb35e39eb1183789d6aaf93457e35b56bf764419
+  atomic: 8174a137121d14c0c6f9359e40b098990b357151
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
index b78311c154f98715db8565a29aa79843461e794b..875bc355963b3a268dc8a6d1cd45efe0ceb0bf1a 100644 (file)
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    9c72d3a49ab622631098c8bb005b82d2410ba704
+Top:    375f712a43d5dd3d438e86606157d335ae7e8590
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -18,9 +18,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/configure.in b/configure.in
-old mode 100644
-new mode 100755
-index 997c775..192289a
+index 997c775..192289a 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -39,6 +39,12 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
@@ -37,9 +35,7 @@ index 997c775..192289a
      if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r
          ac_cv_version_script=yes\r
 diff --git a/linux/osd.h b/linux/osd.h
-old mode 100644
-new mode 100755
-index 722e1b1..9a167a7
+index 722e1b1..9a167a7 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
 @@ -65,9 +65,27 @@
@@ -73,9 +69,7 @@ index 722e1b1..9a167a7
  #define atomic_set(v, s) ((v)->val = s)\r
  \r
 diff --git a/src/acm.c b/src/acm.c
-old mode 100644
-new mode 100755
-index 7c8b84b..56fbb01
+index 7c8b84b..56fbb01 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -268,6 +268,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
@@ -104,9 +98,7 @@ index 7c8b84b..56fbb01
        DListInit(&timeout_list);
        event_init(&timeout_event);
 diff --git a/windows/osd.h b/windows/osd.h
-old mode 100644
-new mode 100755
-index 10e5e18..9587c51
+index 10e5e18..9587c51 100644
 --- a/windows/osd.h
 +++ b/windows/osd.h
 @@ -44,6 +44,7 @@ typedef struct { volatile LONG val; } atomic_t;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8f54129..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 9c72d3a49ab622631098c8bb005b82d2410ba704
-Top:    375f712a43d5dd3d438e86606157d335ae7e8590
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 11:26:11 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/configure.in b/configure.in
-old mode 100755
-new mode 100644
-diff --git a/linux/osd.h b/linux/osd.h
-old mode 100755
-new mode 100644
-diff --git a/src/acm.c b/src/acm.c
-old mode 100755
-new mode 100644
-diff --git a/windows/osd.h b/windows/osd.h
-old mode 100755
-new mode 100644