Re: linux-next: manual merge of the net-next tree with the clk tree

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:

linux-next: manual merge of the net-next tree with the clk tree

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: 9f9d1e