From: Rob Herring <robherring2@gmail.com>
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>
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Wed, 24 Jul 2019 13:31:30 -0600 [thread overview]
Message-ID: <CAL_JsqKoAG9iu7CfuivtfDXE5Opf8sq8=tRPPWQGT4FPOxiyhw@mail.gmail.com> (raw)
In-Reply-To: <20190724130252.7c29bba9@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-07-24 19:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 3:02 linux-next: manual merge of the devicetree tree with Linus' tree Stephen Rothwell
2019-07-24 19:31 ` Rob Herring [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-16 3:42 Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2020-10-15 3:21 Stephen Rothwell
2019-11-12 2:57 Stephen Rothwell
2019-10-16 1:25 Stephen Rothwell
2019-06-24 5:51 Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell
2019-02-14 3:02 Stephen Rothwell
2017-09-06 3:01 Stephen Rothwell
2017-09-06 2:55 Stephen Rothwell
2011-08-05 2:13 Stephen Rothwell
2010-07-16 1:15 Stephen Rothwell
2010-07-16 4:27 ` Grant Likely
2010-06-07 2:53 Stephen Rothwell
2010-06-07 17:03 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAL_JsqKoAG9iu7CfuivtfDXE5Opf8sq8=tRPPWQGT4FPOxiyhw@mail.gmail.com' \
--to=robherring2@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=maxime.ripard@bootlin.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).