Merge commit 'origin' into devel

2 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h
index e51b531cd0b2..47fbcba11850 100644
--- a/include/linux/raid/bitmap.h
+++ b/include/linux/raid/bitmap.h
@@ -235,6 +235,8 @@ struct bitmap {
 
         unsigned long flags;
 
+        int allclean;
+
         unsigned long max_write_behind; /* write-behind mode */
         atomic_t behind_writes;
 
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 85a068bab625..7bb6d1abf71e 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -83,6 +83,7 @@ struct mdk_rdev_s
 #define BarriersNotsupp 5               /* BIO_RW_BARRIER is not supported */
 #define AllReserved     6               /* If whole device is reserved for
                                          * one array */
+#define AutoDetected    7               /* added by auto-detect */
 
         int desc_nr;                    /* descriptor index in the superblock */
         int raid_disk;                  /* role of device in array */