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:
> >
> >
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:
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: qcom: Add ext reset")
d511580ea9c2 ("dt-bindings:
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/pci/cdns-pcie.yaml
between commit:
fb5f8f3ca5f8 ("dt-bindings: PCI: cadence: Deprecate inbound/outbound specific
bindings")
from the pci tree and commit:
3d21a4609335
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
drivers/of/Kconfig
between commit:
4670d610d592 ("PCI: Move OF-related PCI functions into PCI core")
from the pci tree and commit:
6019a3d07d72 ("of: enable unittests on UML")
from the devicetree tree.
I fixed
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
drivers/of/Kconfig
between commit:
4670d610d592 ("PCI: Move OF-related PCI functions into PCI core")
from the pci tree and commit:
6019a3d07d72 ("of: enable unittests on UML")
from the devicetree tree.
I fixed
6 matches
Mail list logo
