On 06.12.2022 15:05, Michal Orzel wrote: > On 06/12/2022 14:46, Jan Beulich wrote: >> On 06.12.2022 14:05, Michal Orzel wrote: >>> Also there is no functional change being made by this patch so it is ok >>> to change Xen and not Linux in this case (which has quite a lot of >>> trigraphs all over the place). >> >> Based on what criteria are you saying this is ok (unconditionally)? > > I said that it is ok to change Xen and not Linux because this file already > diverged, > so we cannot assume that future backports will apply cleanly. If we change a > file > that did not diverge, then we are required to modify the origin first and then > do the backport.
A file might have diverged, yet commits to be pulled in from the original tree may still apply cleanly. That why, in the general case, we aim at limiting the amount of divergence, and we prefer to pull in changes bringing us back closer to the (meanwhile evolved) original file. Jan
