Merge branch 'dm-4.12' into dm-4.12-post-merge

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

diff --cc drivers/md/dm-core.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc include/linux/device-mapper.h
Simple merge