From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robherring2@gmail.com>,
Olof Johansson <olof@lixom.net>,
ARM <linux-arm-kernel@lists.infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Masami Hiramatsu <masami.hiramatsu@linaro.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Fri, 22 May 2020 10:08:14 +0200 [thread overview]
Message-ID: <CAK8P3a1H43KuLbQ0mPNjSCoWbqT2P_kx93zsdYtQXv2nw2WdvQ@mail.gmail.com> (raw)
In-Reply-To: <20200522160313.09cb2b7e@canb.auug.org.au>
On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (see below) 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.
>
> diff --cc Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> index 10a7f0752281,113f93b9ae55..000000000000
> --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> @@@ -51,9 -51,8 +51,9 @@@ properties
> - description: LD20 SoC boards
> items:
> - enum:
> - - socionext,uniphier-ld20-akebi96
> - - socionext,uniphier-ld20-global
> - - socionext,uniphier-ld20-ref
> ++ - socionext,uniphier-ld20-akebi96
> + - socionext,uniphier-ld20-global
> + - socionext,uniphier-ld20-ref
> - const: socionext,uniphier-ld20
> - description: PXs3 SoC boards
> items:
Ok, thanks! I think can let Linus handle this in the merge window.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masami Hiramatsu <masami.hiramatsu@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robherring2@gmail.com>,
Olof Johansson <olof@lixom.net>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Fri, 22 May 2020 10:08:14 +0200 [thread overview]
Message-ID: <CAK8P3a1H43KuLbQ0mPNjSCoWbqT2P_kx93zsdYtQXv2nw2WdvQ@mail.gmail.com> (raw)
In-Reply-To: <20200522160313.09cb2b7e@canb.auug.org.au>
On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (see below) 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.
>
> diff --cc Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> index 10a7f0752281,113f93b9ae55..000000000000
> --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> @@@ -51,9 -51,8 +51,9 @@@ properties
> - description: LD20 SoC boards
> items:
> - enum:
> - - socionext,uniphier-ld20-akebi96
> - - socionext,uniphier-ld20-global
> - - socionext,uniphier-ld20-ref
> ++ - socionext,uniphier-ld20-akebi96
> + - socionext,uniphier-ld20-global
> + - socionext,uniphier-ld20-ref
> - const: socionext,uniphier-ld20
> - description: PXs3 SoC boards
> items:
Ok, thanks! I think can let Linus handle this in the merge window.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-22 8:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 6:03 linux-next: manual merge of the devicetree tree with the arm-soc tree Stephen Rothwell
2020-05-22 6:03 ` Stephen Rothwell
2020-05-22 8:08 ` Arnd Bergmann [this message]
2020-05-22 8:08 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2019-11-14 2:21 Stephen Rothwell
2019-11-14 2:21 ` Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell
2017-11-09 2:26 Stephen Rothwell
2017-11-09 2:26 ` Stephen Rothwell
2017-11-09 2:21 Stephen Rothwell
2017-11-09 2:21 ` Stephen Rothwell
2016-06-27 3:42 Stephen Rothwell
2016-06-27 3:42 ` Stephen Rothwell
2016-06-27 3:42 ` Stephen Rothwell
2014-03-12 22:03 Mark Brown
2014-03-12 22:36 ` Olof Johansson
2014-03-13 12:55 ` Grant Likely
2014-01-17 3:14 Stephen Rothwell
2014-01-17 3:14 ` Stephen Rothwell
2014-01-17 3:14 ` Stephen Rothwell
2014-01-17 3:11 Stephen Rothwell
2014-01-17 3:11 ` Stephen Rothwell
2014-01-17 3:11 ` Stephen Rothwell
2014-01-17 3:08 Stephen Rothwell
2014-01-17 3:08 ` Stephen Rothwell
2014-01-17 3:08 ` Stephen Rothwell
2014-01-17 4:35 ` Jason Cooper
2014-01-17 4:35 ` Jason Cooper
2014-01-17 4:35 ` Jason Cooper
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=CAK8P3a1H43KuLbQ0mPNjSCoWbqT2P_kx93zsdYtQXv2nw2WdvQ@mail.gmail.com \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masami.hiramatsu@linaro.org \
--cc=olof@lixom.net \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=yamada.masahiro@socionext.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.