devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>
To: Jon Loeliger <jdl-CYoMK+44s/E@public.gmane.org>
Cc: glikely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org,
	devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: Re: [PATCH 1/5] scripts: dtc: Merge in changes from the dtc repository
Date: Thu, 18 Nov 2010 14:41:45 +1100	[thread overview]
Message-ID: <20101118034145.GB7256@yookeroo> (raw)
In-Reply-To: <E1PIkEl-0006Zt-W7-CYoMK+44s/E@public.gmane.org>

On Wed, Nov 17, 2010 at 09:47:55AM -0600, Jon Loeliger wrote:
> > On Tue, Nov 16, 2010 at 12:49:51PM -0800, John Bonesio wrote:
> > > Pull in recent changes from the main dtc repository. These changes primarily
> > > allow multiple device trees to be declared which are merged by dtc. This
> > > feature allows us to include a basic dts file and then provide more informatio
> > n
> > > for the specific system through the merging functionality.
> > > 
> > > Signed-off-by: John Bonesio <bones-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> > 
> > Jon & David, I'll need your input on whether or not this is the best
> > way to handle updating the dtc copy in the kernel tree.
> > 
> > g.
> 
> Grant,
> 
> Yeah, I wondered too. :-)  David added it and updated
> in the kernel last round, so he may have some good notion
> of what would be best there.

For now I think just a direct diff updating the in-kernel dtc to
current upstream is the simplest approach.  This is how I made the
original commit.

There may be better methods to directly arrange for pulling of the dtc
git tree into the kernel git tree, but I have not had time to
investigate and set up such a scheme.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

  parent reply	other threads:[~2010-11-18  3:41 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-16 20:49 [PATCH 0/5] Series short description John Bonesio
2010-11-16 20:49 ` [PATCH 1/5] scripts: dtc: Merge in changes from the dtc repository John Bonesio
2010-11-17  4:59   ` Grant Likely
     [not found]     ` <20101117045935.GA12084-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2010-11-17 15:47       ` Jon Loeliger
     [not found]         ` <E1PIkEl-0006Zt-W7-CYoMK+44s/E@public.gmane.org>
2010-11-18  3:41           ` David Gibson [this message]
2010-11-17  5:56   ` Kyle Moffett
     [not found]     ` <AANLkTimTks01SnjWJZFycSCQC+ZBEonPLLUwMRQkxLz2-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-17  5:59       ` Grant Likely
2010-11-17 15:51       ` Jon Loeliger
2010-11-17  6:11   ` Grant Likely
     [not found]     ` <AANLkTinYZYR_QtS5-Nodpaf2MBBuaw06SW9pDCNQ9ov3-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-17  6:29       ` John Bonesio
2010-11-16 20:50 ` [PATCH 2/5] powerpc/5200: dts: rename nodes to prepare for refactoring dts files John Bonesio
2010-11-17  5:03   ` Grant Likely
2010-11-16 20:50 ` [PATCH 3/5] powerpc/5200: dts: remove unused properties John Bonesio
2010-11-17  5:05   ` Grant Likely
2010-11-16 20:50 ` [PATCH 4/5] powerpc/5200: dts: Remove incorrect combatible strings John Bonesio
2010-11-17  5:08   ` Grant Likely
2010-11-16 20:50 ` [PATCH 5/5] powerpc/5200: dts: refactor dts files John Bonesio

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=20101118034145.GB7256@yookeroo \
    --to=david-xt8fgy+axnrb3ne2bgzf6laj5h9x9tb+@public.gmane.org \
    --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=glikely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
    --cc=jdl-CYoMK+44s/E@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    /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).