On Wed, Dec 19, 2012 at 11:37:26AM -0800, Albert ARIBAUD wrote: > Hi Stephen, > > On Tue, 18 Dec 2012 23:04:09 -0700, Stephen Warren > <swar...@wwwdotorg.org> wrote: > > On 12/18/2012 06:08 PM, Allen Martin wrote: > > ... > > > The other alternative is I could provide the conflict resolved files > > > or instructions for how to resolve. > > > > Aren't the two sets of files that conflict those that are already in > > u-boot/master and u-boot-arm/master? If so, only Albert can resolve the > > conflict, by doing a merge. I already did that merge locally a while > > back in order to pick up the changes from both branches, and it didn't > > seem hard; what's the problem here? If Allen can push out a branch for > > Albert to use as an example to make sure he gets the correct merge > > result, that seems like a very simple solution. > > There are several sources of conflicts in merging u-boot into > u-boot-arm. I want all conflicts resolved by the persons who are best > suited for resolving properly, then I'll merge all resolutions together. >
Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and resolved the conflicts and I've pushed the result to: git://github.com/arm000/u-boot.git branch: u-boot-arm-merge-resolved I resolved all the conflicts, but the only ones I claim I did correctly were the changes to: include/configs/seaboard.h include/configs/tegra-common-post.h the other conflicts were not related to tegra. If you want a new pull request, you'll first have to unroll the previously merged tegra patches from u-boot-arm/master so I can give you a conflict free merge request. -Allen -- nvpublic _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
