Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210622181624.57527651@canb.auug.org.au>
In-Reply-To: <20210622181624.57527651@canb.auug.org.au>
From:   Rob Herring <robherring2@gmail.com>
Date:   Wed, 23 Jun 2021 11:26:56 -0600
Message-ID: <CAL_JsqL+4FqU=jexFiXVLN-782N+Qh6DJLYoXZGitTYY2ULRBw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the
 devicetree tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Aswath Govindraju <a-govindraju@ti.com>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Jun 22, 2021 at 2:16 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   Documentation/devicetree/bindings/gpio/gpio-davinci.txt
>
> between commit:
>
>   c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")
>
> from the devicetree tree and commit:
>
>   c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")
>
> from the gpio-brgl tree.
>
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary.

As the reference is gone in the schema, that is the correct resolution.

Rob