Merge branch 'master' into devel-3.0

Conflicts:
	Build.c
	mdadm.c
	mdadm.h
	super1.c

1 files changed, 5 insertions, 0 deletions

diff --git a/Manage.c b/Manage.c
index 1f38fa5..65235bc 100644
--- a/Manage.c
+++ b/Manage.c
@@ -588,6 +588,11 @@ int Manage_subdevs(char *devname, int fd,
 								fprintf(stderr, Name ": re-added %s\n", dv->devname);
 							continue;
 						}
+						if (errno == ENOMEM || errno == EROFS) {
+							fprintf(stderr, Name ": add new device failed for %s: %s\n",
+								dv->devname, strerror(errno));
+							return 1;
+						}
 						/* fall back on normal-add */
 					}
 				}