Remove patch that was integrated upstream.
Remove patches that were integrated upstream.
Replace patches with SUBST statement.