Merge branch 'master' in devel-3.0

diff --cc Makefile
index 30f45c79572814f9a055c9cf859f13cdd5b500c1,24ad694fdaef91756b8b0aa4dabbccd5ab3de44e..94a55d935ac695a97eae1adc7d36a312e7f3ae44
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -96,9 -81,8 +96,9 @@@ STATICSRC = pwgr.
  STATICOBJS = pwgr.o
  
  ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
 -      super0.c super1.c sha1.c sysfs.c
 -ASSEMBLE_AUTO_SRCS := mdopen.c mdstat.c
 +      super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c mdstat.c \
-       platform-intel.c probe_roms.c
- ASSEMBLE_AUTO_SRCS := mdopen.c sysfs.c
++      platform-intel.c probe_roms.c sysfs.c
++ASSEMBLE_AUTO_SRCS := mdopen.c
  ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
  ifdef MDASSEMBLE_AUTO
  ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)

diff --cc Monitor.c
Simple merge

diff --cc inventory
index dffe802a70ca50d65caba803f3a16d596e6c9caf,32e082758cdaadc44f6f5dbb11005e6269b0afe1..f52ec025bba01d4a544c0a5e79ae05a551548e24
--- 1/inventory
--- 2/inventory
+++ b/inventory
@@@ -23,8 -23,7 +23,9 @@@ ANNOUNCE-2.6.
  ANNOUNCE-2.6.6
  ANNOUNCE-2.6.7
  ANNOUNCE-2.6.8
+ ANNOUNCE-2.6.9
 +ANNOUNCE-3.0-devel1
 +ANNOUNCE-3.0-devel2
  Assemble.c
  bitmap.c
  bitmap.h

diff --cc mdassemble.c
index a680378a113c04778b54b93c73ba1cfc9be62dd9,b0d87b8362e7ceee98571d7ae9ceff12f71ba526..2b955c5bb718e22610d012cd85f2905f7169af24
--- 1/mdassemble.c
--- 2/mdassemble.c
+++ b/mdassemble.c
@@@ -69,25 -69,7 +69,21 @@@ int open_mddev(char *dev, int report_er
        }
        return mdfd;
  }
- int sysfs_uevent(struct mdinfo *info, char *event)
- {
-       return 0;
- }
 +int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,
 +               char *chosen)
 +{
 +      return open_mddev(dev, 0);
 +}
  #endif
 +int map_update(struct map_ent **mpp, int devnum, char *metadata,
 +             int *uuid, char *path)
 +{
 +      return 0;
 +}
 +struct map_ent *map_by_name(struct map_ent **mpp, char *name)
 +{
 +      return NULL;
 +}
  
  int rv;
  int mdfd = -1;

diff --cc super1.c
index a4978e8cc5d5db2a58033b8125274d4bb6ba529c,134241249736f552412f7d943c51ee68682d22b3..d1b8a9478ef86da4375177c59312c3c3ef19dbf6
--- 1/super1.c
--- 2/super1.c
+++ b/super1.c
@@@ -884,23 -795,10 +884,27 @@@ static int add_to_super1(struct superty
                *rp = 0xffff;
        else
                *rp = 0xfffe;
 +
+       if (dk->number >= __le32_to_cpu(sb->max_dev) &&
+           __le32_to_cpu(sb->max_dev) < 384)
+               sb->max_dev = __cpu_to_le32(dk->number+1);
++
 +      sb->dev_number = __cpu_to_le32(dk->number);
 +      sb->sb_csum = calc_sb_1_csum(sb);
 +
 +      dip = (struct devinfo **)&st->info;
 +      while (*dip)
 +              dip = &(*dip)->next;
 +      di = malloc(sizeof(struct devinfo));
 +      di->fd = fd;
 +      di->devname = devname;
 +      di->disk = *dk;
 +      di->next = NULL;
 +      *dip = di;
 +
 +      return 0;
  }
 +#endif
  
  static void locate_bitmap1(struct supertype *st, int fd);