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

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
Simple merge