Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 9e65d9e20662..6f6df86f1ae5 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -277,7 +277,10 @@ struct mdp_superblock_1 {
                                            */
 #define MD_FEATURE_RESHAPE_ACTIVE       4
 #define MD_FEATURE_BAD_BLOCKS           8 /* badblock list is not empty */
-
-#define MD_FEATURE_ALL                  (1|2|4|8)
+#define MD_FEATURE_REPLACEMENT          16 /* This device is replacing an
+                                            * active device with same 'role'.
+                                            * 'recovery_offset' is also set.
+                                            */
+#define MD_FEATURE_ALL                  (1|2|4|8|16)
 
 #endif