So it turns out that while git-am complained it did apply the patch just fine and it didn't look whitespace mangled. No idea what went on there, but the patch is in nvme-5.13 now.
- [PATCH v3] nvme: disallow passthru cmd from targeting a ... Niklas Cassel
- Re: [PATCH v3] nvme: disallow passthru cmd from tar... Christoph Hellwig

