Jens, How would you like to resolve this patch series? Roman's patch that this is based off of just made it into linux-next:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/+/928776957ea4e1c35b1c4c35b8fe7203354fbae3 I suppose you can pull that into the block tree and have git merge resolve it when it all goes to linus. Another option would be routing this through Andrew's -mm tree (which already has that commit). Up to you which you prefer.
