From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 May 2017 17:34:03 +0000 (-0700)
Subject: Merge tag 'for-4.12/dm-post-merge-changes' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b66f13207e60e7c550af730986e77e38a0c69a3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'for-4.12/dm-post-merge-changes' of git://git./linux/kernel/git/device-mapper/linux-dm

Pull additional device mapper updates from Mike Snitzer:
 "Here are some changes from Christoph that needed to be rebased ontop
  of changes that were already merged into the device mapper tree. In
  addition, these changes depend on the 'for-4.12/block' changes that
  you've already merged.

   - Cleanups to request-based DM and DM multipath from Christoph that
     prepare for his block core error code type checking improvements"

* tag 'for-4.12/dm-post-merge-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: introduce a new DM_MAPIO_KILL return value
  dm rq: change ->rq_end_io calling conventions
  dm mpath: merge do_end_io into multipath_end_io
---

7b66f13207e60e7c550af730986e77e38a0c69a3