When upstream mixes bugfixes and refactorings, SRUs are a balance between:
*) The exact upstream code has *probably* been tested more, so is probably safer
*) The minimal fix changes behaviour less, so is probably safer
Since *both* options are "probably safer", it mostly depends on what "the minimal fix" looks like. If the minimal fix looks sensible, we'll generally prefer it even if it's not a direct cherry-pick from upstream.
Here it looks like maybe the minimal fix *is* sensible? Could you confidently generate a package that fixes these bugs but doesn't include all the refactorings?
When upstream mixes bugfixes and refactorings, SRUs are a balance between:
*) The exact upstream code has *probably* been tested more, so is probably safer
*) The minimal fix changes behaviour less, so is probably safer
Since *both* options are "probably safer", it mostly depends on what "the minimal fix" looks like. If the minimal fix looks sensible, we'll generally prefer it even if it's not a direct cherry-pick from upstream.
Here it looks like maybe the minimal fix *is* sensible? Could you confidently generate a package that fixes these bugs but doesn't include all the refactorings?