Merge branch 'dm-4.12' into dm-4.12-post-merge
authorMike Snitzer <snitzer@redhat.com>
Mon, 1 May 2017 22:18:04 +0000 (18:18 -0400)
committerMike Snitzer <snitzer@redhat.com>
Mon, 1 May 2017 22:18:04 +0000 (18:18 -0400)
12 files changed:
1  2 
drivers/md/dm-cache-target.c
drivers/md/dm-core.h
drivers/md/dm-crypt.c
drivers/md/dm-linear.c
drivers/md/dm-mpath.c
drivers/md/dm-raid.c
drivers/md/dm-rq.c
drivers/md/dm-stripe.c
drivers/md/dm-table.c
drivers/md/dm-thin.c
drivers/md/dm.c
include/linux/device-mapper.h

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