Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc block/bounce.c
Simple merge

diff --cc drivers/md/dm-table.c
Simple merge

diff --cc drivers/md/dm.c
index 2caf492,38837f8..4d6f089
--- 1/drivers/md/dm.c
--- 2/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -1087,8 -1036,8 +1036,6 @@@ static void free_rq_clone(struct reques
        struct dm_rq_target_io *tio = clone->end_io_data;
        struct mapped_device *md = tio->md;
  
-       blk_rq_unprep_clone(clone);
 -      WARN_ON_ONCE(must_be_mapped && !clone->q);
--
        if (md->type == DM_TYPE_MQ_REQUEST_BASED)
                /* stacked on blk-mq queue(s) */
                tio->ti->type->release_clone_rq(clone);
@@@ -1977,13 -1887,9 +1893,9 @@@ static int map_request(struct dm_rq_tar
                        dm_kill_unmapped_request(rq, r);
                        return r;
                }
 -              if (IS_ERR(clone))
 -                      return DM_MAPIO_REQUEUE;
 +              if (r != DM_MAPIO_REMAPPED)
 +                      return r;
-               if (setup_clone(clone, rq, tio, GFP_ATOMIC)) {
-                       /* -ENOMEM */
-                       ti->type->release_clone_rq(clone);
-                       return DM_MAPIO_REQUEUE;
-               }
+               setup_clone(clone, rq, tio);
        }
  
        switch (r) {

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc include/linux/blk_types.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge