Overstreet
[dpark: also remove ->merge_bvec_fn() in dm-thin as well as
dm-era-target, and resolve merge conflicts]
Signed-off-by: Dongsu Park
---
block/blk-merge.c | 17 +-
block/blk-settings.c | 22
drivers/block/drbd/drbd_int.h | 1 -
drivers/block/d
o remove ->merge_bvec_fn() in dm-thin as well as
dm-era-target, and resolve merge conflicts]
Signed-off-by: Dongsu Park
Cc: Jens Axboe
Cc: drbd-...@lists.linbit.com
Cc: Jiri Kosina
Cc: Yehuda Sadeh
Cc: Sage Weil
Cc: Alex Elder
Cc: ceph-devel@vger.kernel.org
Cc: Alasdair Kergon
Cc: Mike Snitzer
