On 11/01/2024 19:07, Cristian Ciocaltea wrote: > On 1/11/24 04:55, Tan Chun Hau wrote: >> Add StarFive JH8100 dwmac support. >> JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. >> >> Signed-off-by: Tan Chun Hau <chunhau.tan@xxxxxxxxxxxxxxxx> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >> .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ >> 2 files changed, 37 insertions(+), 14 deletions(-) > > [...] > > Please note this is going to conflict with the about-to-be-merged changes They weren't picked up, so how they can be merged? If you mean applied, then you suggest your patchset has some kind of preference, but this needs explanation why. Best regards, Krzysztof
