diff --git a/[refs] b/[refs]
index 1937043a6c2f..9a0d7cd6a8b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b441a262e7d1c56fbe21794c91d7a9c83809113f
+refs/heads/master: f8facb61b5095488a4d78fa78116ef4f4b82bc4d
diff --git a/trunk/drivers/md/dm-zero.c b/trunk/drivers/md/dm-zero.c
index bbc97030c0c2..cc2b3cb81946 100644
--- a/trunk/drivers/md/dm-zero.c
+++ b/trunk/drivers/md/dm-zero.c
@@ -22,6 +22,11 @@ static int zero_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		return -EINVAL;
 	}
 
+	/*
+	 * Silently drop discards, avoiding -EOPNOTSUPP.
+	 */
+	ti->num_discard_requests = 1;
+
 	return 0;
 }