Hi all, On Tue, 2 Jun 2020 12:09:57 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt > > between commit: > > 7b9e111a5216 ("dt-bindings: clock: mediatek: document clk bindings for Mediatek MT6765 SoC") > > from the clk tree and commit: > > 9f9d1e63dc55 ("dt-bindings: convert the binding document for mediatek PERICFG to yaml") > > from the net-next tree. > > I fixed it up (I deleted the file and added the following patch) and > can carry the fix as necessary. This is now fixed as far as linux-next > is concerned, but any non trivial conflicts should be mentioned to your > upstream maintainer when your tree is submitted for merging. You may > also want to consider cooperating with the maintainer of the conflicting > tree to minimise any particularly complex conflicts. > > From: Stephen Rothwell > Date: Tue, 2 Jun 2020 12:07:03 +1000 > Subject: [PATCH] dt-bindings: fix up for "dt-bindings: clock: mediatek: > document clk bindings for Mediatek MT6765 SoC" > > Signed-off-by: Stephen Rothwell > --- > .../devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml > index 55209a2baedc..e271c4682ebc 100644 > --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml > +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml > @@ -20,6 +20,7 @@ properties: > - enum: > - mediatek,mt2701-pericfg > - mediatek,mt2712-pericfg > + - mediatek,mt6765-pericfg > - mediatek,mt7622-pericfg > - mediatek,mt7629-pericfg > - mediatek,mt8135-pericfg > -- > 2.26.2 This merge resolution patch is now needed when the clk tree merges with Linus' tree -- Cheers, Stephen Rothwell