linux-kernel - Re: linux-next: manual merge of the staging tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <5A9BB933-9031-45AF-BB92-BE94D30EF83D@jic23.retrosnub.co.uk>
Date:   Fri, 20 Jan 2017 17:24:30 +0000
From:   Jonathan Cameron <jic23@...23.retrosnub.co.uk>
To:     Greg KH <greg@...ah.com>, Rob Herring <robherring2@...il.com>
CC:     Stephen Rothwell <sfr@...b.auug.org.au>,
        linux-next <linux-next@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Marek Vasut <marek.vasut@...il.com>,
        Matt Ranostay <matt@...ostay.consulting>,
        Jonathan Cameron <jic23@...nel.org>
Subject: Re: linux-next: manual merge of the staging tree with the devicetree tree



On 20 January 2017 08:30:22 GMT+00:00, Greg KH <greg@...ah.com> wrote:
>On Thu, Jan 19, 2017 at 09:17:01PM -0600, Rob Herring wrote:
>> On Thu, Jan 19, 2017 at 8:55 PM, Stephen Rothwell
><sfr@...b.auug.org.au> wrote:
>> > Hi Greg,
>> >
>> > Today's linux-next merge of the staging tree got a conflict in:
>> >
>> >   Documentation/devicetree/bindings/vendor-prefixes.txt
>> >
>> > between commit:
>> >
>> >   566088d1d2a0 ("devicetree: Add Fujitsu Ltd. vendor prefix")
>> >
>> > from the devicetree tree and commit:
>> >
>> >   9b27c270d403 ("devicetree: add Garmin vendor prefix")
>> >
>> > from the staging 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.
>> >
>> > --
>> > Cheers,
>> > Stephen Rothwell
>> >
>> > diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
>> > index 14fd1c24e1f0,b34463b12382..000000000000
>> > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
>> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
>> > @@@ -107,7 -108,7 +108,8 @@@ firefly    Firefl
>> >   focaltech     FocalTech Systems Co.,Ltd
>> >   friendlyarm   Guangzhou FriendlyARM Computer Tech Co., Ltd
>> >   fsl   Freescale Semiconductor
>> >  +fujitsu       Fujitsu Ltd.
>> > + grmn  Garmin Limited
>> 
>> Ugg. This didn't get sorted correctly when changed from garmin to
>grmn...
>
>Ick, sorry I missed that, I'll go queue up a patch to fix it in the
>staging tree.
>
>greg k-h

Me too. Thanks for sorting!

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.