From: Linus Torvalds Date: Fri, 5 May 2023 20:27:59 +0000 (-0700) Subject: Merge tag 'devicetree-fixes-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v6.6.7~2888 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=418d5c98319f67b9ae651babea031b5394425c18;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'devicetree-fixes-for-6.4-1' of git://git./linux/kernel/git/robh/linux Pull devicetree fixes from Rob Herring: - Add Conor Dooley as a DT binding maintainer - Swap the order of parsing /memreserve/ and /reserved-memory nodes so that the /reserved-memory nodes which have more information are handled first - Fix some property dependencies in riscv,pmu binding - Update maintainers entries on a couple of bindings * tag 'devicetree-fixes-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: MAINTAINERS: add Conor as a dt-bindings maintainer dt-bindings: perf: riscv,pmu: fix property dependencies dt-bindings: xilinx: Remove Naga from memory and mtd bindings of: fdt: Scan /memreserve/ last dt-bindings: clock: r9a06g032-sysctrl: Change maintainer to Fabrizio Castro dt-bindings: pinctrl: renesas,rzv2m: Change maintainer to Fabrizio Castro dt-bindings: pinctrl: renesas,rzn1: Change maintainer to Fabrizio Castro dt-bindings: i2c: renesas,rzv2m: Change maintainer to Fabrizio Castro --- 418d5c98319f67b9ae651babea031b5394425c18 diff --cc Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml index 2fe53cb,3050575..15b63bb --- a/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml +++ b/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml @@@ -7,10 -7,10 +7,10 @@@ $schema: http://devicetree.org/meta-sch title: Arasan NAND Flash Controller with ONFI 3.1 support allOf: - - $ref: "nand-controller.yaml" + - $ref: nand-controller.yaml maintainers: - - Naga Sureshkumar Relli + - Michal Simek properties: compatible: