Re: [PATCH v5 0/1] MR321: vkd3d-shader/hlsl: Implement intrinsic tan.

[Zebediah Figura (＠zfigura)]

> OK, I have it fixed on my local copy, but I'm not sure on the protocol for MRs with conflict-fixing commits. What should I do there?

Just rebase and resend.

Though we are close to release so it wouldn't surprise me if this is delayed until after 1.9.