Merge branch 'master' into devel-3.0

Conflicts:

	Assemble.c
	Incremental.c
	Kill.c
	ReadMe.c
	inventory
	mapfile.c
	mdadm.8
	mdadm.spec
	mdassemble.8

1 files changed, 3 insertions, 1 deletions

diff --git a/Kill.c b/Kill.c
index d5c1e36d..96b270f2 100644
--- a/Kill.c
+++ b/Kill.c
@@ -44,7 +44,9 @@ int Kill(char *dev, int force, int quiet, int noexcl)
 	int fd, rv = 0;
 	struct supertype *st;
 
-	fd = open(dev, O_DIRECT | (noexcl ? O_RDWR : (O_RDWR|O_EXCL)));
+	if (force)
+		noexcl = 1;
+	fd = open(dev, O_RDWR|(force ? 0 : O_EXCL));
 	if (fd < 0) {
 		if (!quiet)
 			fprintf(stderr, Name ": Couldn't open %s for write - not zeroing\n",