Merge branch 'master' into devel-3.2

Conflicts:
	super-intel.c

diff --cc super-intel.c
index 29438988a2a11b72556b80764f490f119c9689f7,b3a116f90308d75f2229c6ba1b70a3e78a7a1ce0..38f9622591c0fd5d6a911645c7883ff93535aa5c
--- 1/super-intel.c
--- 2/super-intel.c
+++ b/super-intel.c
@@@ -4202,14 -4119,10 +4202,15 @@@ static void default_geometry_imsm(struc
  {
        struct intel_super *super = st->sb;
  
 -      if (!super || !super->orom)
 -              return 0;
 +      if (level && *level == UnSet)
 +              *level = LEVEL_CONTAINER;
 +
 +      if (level && layout && *layout == UnSet)
 +              *layout = imsm_level_to_layout(*level);
  
-       if (chunk && (*chunk == UnSet || *chunk == 0) && super->orom)
 -      return imsm_orom_default_chunk(super->orom);
++      if (chunk && (*chunk == UnSet || *chunk == 0) && 
++          super && super->orom)
 +              *chunk = imsm_orom_default_chunk(super->orom);
  }
  
  static void handle_missing(struct intel_super *super, struct imsm_dev *dev);