Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220322141029.1885af98@canb.auug.org.au> <Yjl4KsmOQWVfUui8@google.com>
In-Reply-To: <Yjl4KsmOQWVfUui8@google.com>
From:   Rob Herring <robherring2@gmail.com>
Date:   Tue, 22 Mar 2022 07:43:54 -0500
Message-ID: <CAL_Jsq+54TmvzTJ9iEJOWBjVd0dukZGSHN97Kqtfhpw_8f3kYQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree
To:     Lee Jones <lee.jones@linaro.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Walle <michael@walle.cc>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Mar 22, 2022 at 2:18 AM Lee Jones <lee.jones@linaro.org> wrote:
>
> On Tue, 22 Mar 2022, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mfd/syscon.yaml
> >
> > between commit:
> >
> >   844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")
> >
> > from the mfd tree and commit:
> >
> >   c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")
> >
> > from the devicetree tree.
>
> Did you accidentally hoover this up Rob?

I'll drop it.

Rob