mark cross.patch as applied upstream