From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC281C33CA8 for ; Mon, 13 Jan 2020 09:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C58BF2081E for ; Mon, 13 Jan 2020 09:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725832AbgAMJMk (ORCPT ); Mon, 13 Jan 2020 04:12:40 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:54977 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbgAMJMk (ORCPT ); Mon, 13 Jan 2020 04:12:40 -0500 X-Originating-IP: 90.76.211.102 Received: from aptenodytes (lfbn-tou-1-1151-102.w90-76.abo.wanadoo.fr [90.76.211.102]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id C1E8DFF809; Mon, 13 Jan 2020 09:12:37 +0000 (UTC) Date: Mon, 13 Jan 2020 10:12:37 +0100 From: Paul Kocialkowski To: Stephen Rothwell Cc: Linus Walleij , Ralf Baechle , James Hogan , Linux Next Mailing List , Linux Kernel Mailing List , =?utf-8?B?5ZGo55Cw5p2wIChaaG91IFlhbmppZSk=?= , Paul Burton Subject: Re: linux-next: manual merge of the gpio tree with the mips tree Message-ID: <20200113091237.GA1748@aptenodytes> References: <20200110155150.3942c3fc@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zhXaljGHf11kAtnf" Content-Disposition: inline In-Reply-To: <20200110155150.3942c3fc@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --zhXaljGHf11kAtnf Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri 10 Jan 20, 15:51, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the gpio tree got a conflict in: >=20 > Documentation/devicetree/bindings/vendor-prefixes.yaml >=20 > between commit: >=20 > 9d022be3c192 ("dt-bindings: Document yna vendor-prefix.") >=20 > from the mips tree and commit: >=20 > 885503fbea21 ("dt-bindings: Add Xylon vendor prefix") >=20 > from the gpio tree. >=20 > 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". > --=20 > Cheers, > Stephen Rothwell >=20 > 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,.*": --=20 Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com --zhXaljGHf11kAtnf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJZpWjZeIetVBefti3cLmz3+fv9EFAl4cNIUACgkQ3cLmz3+f v9HpRQf/RXlDCHxByYkhdvBNbC1MpOPgndM0X5FmvMfk2ZeYRkD8cpfT9daNo85T svvT59ow1RgMXUv9l7RxWYV8Q3FVBlAdM3fPaYVdoSe4zgwH+4uyDq+9HKo/qsOf EtWO7wuhOcLBqcJ6M0AxsEqpgYAeMVYxISd9vg42kd6GMQCIWihHAJ5V7YyD/65o u6YRlCqJxGmKiVc0Q+m07KSeMReMzfjxtpMHc7QtJ624Pxv/uHsu2bzeo0NuqwO+ biHdwSC3RWJgRbVdaV11HsRNOHqJ5ETb1ABws6KRM5s3Z+iihmVgZqBHAcPNdxMR y78ObV9/+7LyGIpNwhZWkSKrYjF0JA== =0lTb -----END PGP SIGNATURE----- --zhXaljGHf11kAtnf--