From: NeilBrown <neilb@suse.de>
Date: Tue, 14 Apr 2009 01:11:14 +0000 (+1000)
Subject: Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
X-Git-Tag: mdadm-3.0-rc1~28
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=c256924e52249b52bad42963176c42601f1a08f4

Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0

Conflicts:
	Grow.c
	mdadm.h
	sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.
---

c256924e52249b52bad42963176c42601f1a08f4
diff --cc Grow.c
index fc809c63,7083c184..15cec5f1
--- a/Grow.c
+++ b/Grow.c
@@@ -809,6 -809,8 +809,7 @@@ int Grow_reshape(char *devname, int fd
  		/* wait for reshape to pass the critical region */
  		while(1) {
  			unsigned long long comp;
 -			char a[20];
+ 
  			if (sysfs_get_ll(sra, NULL, "sync_completed", &comp)<0) {
  				sleep(5);
  				break;