Messages in this thread | | | Date | Wed, 22 Mar 2023 12:01:45 +0200 | From | Andy Shevchenko <> | Subject | Re: [PATCH v5 0/8] Support ROHM BU27034 ALS sensor |
| |
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.
> - document all exported GTS helpers. > - inline a few GTS helpers > - use again Milli lux for the bu27034 with RAW IIO_LIGHT channel and scale > - Fix bug from added in v4 bu27034 time setting.
-- With Best Regards, Andy Shevchenko
| |