Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> writes: Hello Andy, > On Wed, Mar 22, 2023 at 11:05:23AM +0200, Matti Vaittinen wrote: > >> Revision history: >> v4 => v5: Mostly fixes to review comments from Andy and Jonathan. >> - more accurate change-log in individual patches > >> - copy code from DRM test helper instead of moving it to simplify >> merging > > 1) Why do you think this is a problem? > 2) How would we avoid spreading more copies of the same code in the future? > > > 1) Merge conflicts is not a bad thing. It shows that people tested their code > in isolation and stabilized it before submitting to the upper maintainer. > > https://yarchive.net/comp/linux/git_merges_from_upstream.html > > 2) Spreading the same code when we _know_ this, should be very well justified. > Merge conflict is an administrative point, and not a technical obstacle to > avoid. > I believe this was suggested by Maxime and the rationale is that by just copying the helpers for now, that would make it easier to land instead of requiring coordination between different subystems. Otherwise the IIO tree will need to provide an inmutable branch for the DRM tree to merge and so on. I agree with Maxime that a little bit of duplication (that can be cleaned up by each subsystem at their own pace) is the path of least resistance. -- Best regards, Javier Martinez Canillas Core Platforms Red Hat
