On Tue, Aug 03, 2021 at 06:38:56AM +0200, Mauro Carvalho Chehab wrote: > Convert the file into a JSON description at the yaml format. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> > --- > .../bindings/pci/hisilicon,kirin-pcie.yaml | 86 +++++++++++++++++++ > .../devicetree/bindings/pci/kirin-pcie.txt | 50 ----------- > .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- > MAINTAINERS | 2 +- > 4 files changed, 88 insertions(+), 52 deletions(-) > create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml > delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt This doesn't apply to my tree. I think the problem is I have some other snps,dw-pcie.yaml changes. Can you rebase and resend. Rob
