Thanks, applied to nvme-4.13. Note that one way to share the code without much overhead would be turn it into inline routines in a header. We'd still get duplicate object code instances, but we'd only need to maintain the code in one place.