drop patches applied in upstream, refine remaining patches