Re: linux-next: manual merge of the devicetree tree with the pci tree

2020-07-28 Thread Rob Herring
On Tue, Jul 28, 2020 at 2:28 AM Sivaprakash Murugesan wrote: > > On 7/28/2020 11:19 AM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > >Documentation/devicetree/bindings/pci/qcom,pcie.txt > > > > between commits: > > > >

Re: linux-next: manual merge of the devicetree tree with the pci tree

2020-07-28 Thread Sivaprakash Murugesan
On 7/28/2020 11:19 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/pci/qcom,pcie.txt between commits: 736ae5c91712 ("dt-bindings: PCI: qcom: Add missing clks") b11b8cc161de ("dt-bindings: PCI: qc