Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190724130252.7c29bba9@canb.auug.org.au>
In-Reply-To: <20190724130252.7c29bba9@canb.auug.org.au>
From:   Rob Herring <robherring2@gmail.com>
Date:   Wed, 24 Jul 2019 13:31:30 -0600
Message-ID: <CAL_JsqKoAG9iu7CfuivtfDXE5Opf8sq8=tRPPWQGT4FPOxiyhw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Luca Weiss <luca@z3ntu.xyz>,
        Maxime Ripard <maxime.ripard@bootlin.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Jul 23, 2019 at 9:02 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
>
> between commit:
>
>   355fb0e54e85 ("dt-bindings: input: sun4i-lradc-keys: Add A64 compatible")
>
> from Linus' tree and commit:
>
>   3f587b3b77b9 ("dt-bindings: input: Convert Allwinner LRADC to a schema")
>
> from the devicetree tree.
>
> I fixed it up (I removed the file - the additions from the former
> have been incorporated into the latter) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

I've updated my for-next branch to 5.3-rc1, so this should be resolved now.

Rob