On 01/03/2024 10:41, Théo Lebrun wrote: > Hello, > > On Fri Mar 1, 2024 at 7:53 AM CET, Guenter Roeck wrote: >> On 2/29/24 22:37, Krzysztof Kozlowski wrote: >>> On 29/02/2024 19:10, Théo Lebrun wrote: >>>> Reference common hwmon schema which has the generic "label" property, >>>> parsed by Linux hwmon subsystem. >>>> >>> >>> Please do not mix independent patchsets. You create unneeded >>> dependencies blocking this patch. This patch depends on hwmon work, so >>> it cannot go through different tree. > > I had to pick between this or dtbs_check failing on my DTS that uses a > label on temperature-sensor@48. I don't see how is that relevant. You can organize your branches as you wish, e.g. base one b4 branch on another and you will not have any warnings. > >>> If you insist to combine independent patches, then at least clearly >>> express merging strategy or dependency in patch changelog --- . > > I do not know how such indirect conflicts are usually resolved. Hwmon > can take it but MIPS might want to also take it to have valid DTS. > > Any advice? I don't see any conflict. > >> For my part I have to say that I don't know what to do with it. >> Rob's robot reported errors, so I won't apply it, and I don't >> feel comfortable giving it an ack either because of those errors. > > Can reproduce the error when patch "dt-bindings: hwmon: add common > properties" is not applied. Cannot reproduce when patch is applied. > Commit d590900b62f0 on hwmon-next. Cannot reproduce with hwmon-next as > parent. Yeah, but we see the error reported and it means something is missing. Best regards, Krzysztof
