Applied both to nvme-4.17-rc3. Just FYI, I plan to send a pull request by end of today. I know there's other pathches that may be 4.17 material still under review, and that may need to wait for the next round.