Merge branch 'master' into scratch-3.0

Conflicts:

	Assemble.c
	config.c

1 files changed, 2 insertions, 0 deletions

diff --git a/mdadm.c b/mdadm.c
index a0d6097..1f9b707 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1241,6 +1241,7 @@ int main(int argc, char *argv[])
 							rv |= WaitClean(name, v);
 						put_md_name(name);
 					}
+					free_mdstat(ms);
 				} else	if (devmode == 'S' && scan) {
 					/* apply --stop to all devices in /proc/mdstat */
 					/* Due to possible stacking of devices, repeat until
@@ -1273,6 +1274,7 @@ int main(int argc, char *argv[])
 
 							put_md_name(name);
 						}
+						free_mdstat(ms);
 					} while (!last && err);
 					if (err) rv |= 1;
 				} else {