IRS rules are ambiguous but I would assume, perhaps incorrectly, that the puts are substantially identical since they both profit if XYZ drops.
I have an open order for a calendar roll but so far, no fill. If I get a fill, I'll do the same with my other long put position, converting both to...