Hi all, these two CMB cleanups were part of the p2p support series, but really are nvme specific. Given that we're running out of time for the 4.16 merge window, what about pulling them in through the nvme tree?