From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerry Van Baren <gerald.vanbaren@ge.com>
Date: Mon, 03 Mar 2008 08:14:24 -0500
Subject: [U-Boot-Users] [PATCH 6/8] libfdt: Add and use a node iteration
 helper function.
In-Reply-To: <47CBC31C.9030707@semihalf.com>
References: <20080229231920.8049.35680.stgit@hekate.izotz.org>	<20080229231955.8049.59346.stgit@hekate.izotz.org>	<47C9A850.8020404@gmail.com>
	<47CBC31C.9030707@semihalf.com>
Message-ID: <47CBF9B0.2030806@ge.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Marian Balakowicz wrote:
> Hi Jerry,
> 
> Jerry Van Baren wrote:

[snip]

>> Did you cherry-pick this out of the u-boot-fdt subrepo or apply it
>> yourself from David's patch?
>>
>> I don't know how git will react if we both apply the same patch,
>> possibly differently.  (I applied it by hand editing the patch to change
>> the include/libfdt.h path and then using git-am to apply it.  I presume
>> you either cherry-picked my application or did the same.)
> 
> I've seen the patch on the ml, but than noticed it's already in the
> custodian repo, so I took the easier approach and cherry picked from
> u-boot-fdt.
> 
> Cheers,
> m.

Excellent.  Git should have no problem sorting that out (I've swapped 
patches with Kim with no problems).

Best regards,
gvb