Merge remote-tracking branch 'device-mapper/for-next'

Conflicts:
	drivers/md/dm-thin.c

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

diff --cc drivers/md/dm-cache-policy-mq.c
Simple merge

diff --cc drivers/md/dm-cache-target.c
Simple merge

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

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

diff --cc drivers/md/dm-thin.c
index 357eb272dbd9d3337bf5d1a13db443261eb2b24b,d2328bb051923c3cb4e03c167f7b5a6feccf882d..ebe0799c2ea98384c995d56026fce146ca628dd2
--- 1/drivers/md/dm-thin.c
--- 2/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@@ -1262,8 -1258,8 +1264,8 @@@ static void process_bio_read_only(struc
        r = dm_thin_find_block(tc->td, block, 1, &lookup_result);
        switch (r) {
        case 0:
 -              if (lookup_result.shared && (rw == WRITE) && bio->bi_size)
 +              if (lookup_result.shared && (rw == WRITE) && bio->bi_iter.bi_size)
-                       bio_io_error(bio);
+                       handle_unserviceable_bio(tc->pool, bio);
                else {
                        inc_all_io_entry(tc->pool, bio);
                        remap_and_issue(tc, bio, lookup_result.block);

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