Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux

Introduction of the MTD pairing scheme concept.

diff --combined drivers/mtd/mtdpart.c
index ec852fa,e32a0ac..c1f34f0
--- 1/drivers/mtd/mtdpart.c
--- 2/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@@ -317,18 -317,6 +317,18 @@@ static int part_block_markbad(struct mt
        return res;
  }
  
 +static int part_get_device(struct mtd_info *mtd)
 +{
 +      struct mtd_part *part = mtd_to_part(mtd);
 +      return part->master->_get_device(part->master);
 +}
 +
 +static void part_put_device(struct mtd_info *mtd)
 +{
 +      struct mtd_part *part = mtd_to_part(mtd);
 +      part->master->_put_device(part->master);
 +}
 +
  static int part_ooblayout_ecc(struct mtd_info *mtd, int section,
                              struct mtd_oob_region *oobregion)
  {
@@@ -409,6 -397,7 +409,7 @@@ static struct mtd_part *allocate_partit
        slave->mtd.oobsize = master->oobsize;
        slave->mtd.oobavail = master->oobavail;
        slave->mtd.subpage_sft = master->subpage_sft;
+       slave->mtd.pairing = master->pairing;
  
        slave->mtd.name = name;
        slave->mtd.owner = master->owner;
@@@ -475,12 -464,6 +476,12 @@@
                slave->mtd._block_isbad = part_block_isbad;
        if (master->_block_markbad)
                slave->mtd._block_markbad = part_block_markbad;
 +
 +      if (master->_get_device)
 +              slave->mtd._get_device = part_get_device;
 +      if (master->_put_device)
 +              slave->mtd._put_device = part_put_device;
 +
        slave->mtd._erase = part_erase;
        slave->master = master;
        slave->offset = part->offset;