From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Linus Walleij" <linus.walleij@linaro.org>,
"Ralf Baechle" <ralf@linux-mips.org>,
"James Hogan" <jhogan@kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"周琰杰 (Zhou Yanjie)" <zhouyanjie@wanyeetech.com>,
"Paul Burton" <paulburton@kernel.org>
Subject: Re: linux-next: manual merge of the gpio tree with the mips tree
Date: Mon, 13 Jan 2020 10:12:37 +0100 [thread overview]
Message-ID: <20200113091237.GA1748@aptenodytes> (raw)
In-Reply-To: <20200110155150.3942c3fc@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]
Hi,
On Fri 10 Jan 20, 15:51, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.yaml
>
> between commit:
>
> 9d022be3c192 ("dt-bindings: Document yna vendor-prefix.")
>
> from the mips tree and commit:
>
> 885503fbea21 ("dt-bindings: Add Xylon vendor prefix")
>
> from the gpio tree.
>
> 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.
Thanks for the fix. We might want to keep the list ordered though, with
"xylon" listed after "xunlong" and before "yna".
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
> index b44257d0e16e,9cb3bc683db7..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@@ -1082,8 -1060,8 +1082,10 @@@ patternProperties
> description: Xilinx
> "^xunlong,.*":
> description: Shenzhen Xunlong Software CO.,Limited
> + "^yna,.*":
> + description: YSH & ATIL
> + "^xylon,.*":
> + description: Xylon
So reversing the two blocks above.
What do you think?
Cheers,
Paul
> "^yones-toptech,.*":
> description: Yones Toptech Co., Ltd.
> "^ysoft,.*":
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-01-13 9:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 4:51 linux-next: manual merge of the gpio tree with the mips tree Stephen Rothwell
2020-01-13 9:12 ` Paul Kocialkowski [this message]
2020-01-13 11:45 ` Stephen Rothwell
2020-01-29 22:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2016-05-12 4:17 Stephen Rothwell
2016-05-12 13:35 ` Linus Walleij
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=20200113091237.GA1748@aptenodytes \
--to=paul.kocialkowski@bootlin.com \
--cc=jhogan@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=zhouyanjie@wanyeetech.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox