From: Greg KH <greg@kroah.com>
To: Rob Herring <robherring2@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marek Vasut <marek.vasut@gmail.com>,
Matt Ranostay <matt@ranostay.consulting>,
Jonathan Cameron <jic23@kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the devicetree tree
Date: Fri, 20 Jan 2017 09:30:22 +0100 [thread overview]
Message-ID: <20170120083022.GA28854@kroah.com> (raw)
In-Reply-To: <CAL_JsqJAzyk3JNwdf0Q8hQ3q29xa3S5YHAUyph7qHKaPpOGWEQ@mail.gmail.com>
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@canb.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
next prev parent reply other threads:[~2017-01-20 8:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 2:55 linux-next: manual merge of the staging tree with the devicetree tree Stephen Rothwell
2017-01-20 3:17 ` Rob Herring
2017-01-20 8:30 ` Greg KH [this message]
2017-01-20 17:24 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2018-07-27 7:53 Stephen Rothwell
2018-07-27 8:36 ` Greg KH
2020-10-06 7:49 Stephen Rothwell
2020-10-06 8:18 ` Greg KH
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=20170120083022.GA28854@kroah.com \
--to=greg@kroah.com \
--cc=jic23@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=matt@ranostay.consulting \
--cc=robherring2@gmail.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).