> -----Original Message----- > From: Michael Walle [mailto:mich...@walle.cc] > Sent: 06 June 2012 12:39 > To: Joe Hershberger > Cc: Prafulla Wadaskar; u-boot@lists.denx.de > Subject: Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl > board support > > > > Joe Hershberger <joe.hershber...@gmail.com> schrieb: > > >Hi Prafulla, > > > >On Tue, Jun 5, 2012 at 4:36 PM, Michael Walle <mich...@walle.cc> > wrote: > >> > >> Hi Prafulla, > >> > >> Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle: > >>> Changes: > >>> v9: > >>> - rebase to marvell custodian tree, merged with wolfgangs master > >> [..snip..] > >> > >> > >> I had to merge your tree with wolfgangs master, because my second > net > >patch > >> depends on the latest net patches by Joe. > >> > >> So please make sure you merge wolfgangs master with your tree > before > >applying > >> these patches.
u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync with this before any task. And just to keep it clean for pull requests I would not like to pull any other repository in it. Copying Albert on this, who can sync u-boot.git into u-boot-arm.git if something is missing. Regards.. Prafulla . . . > > > >It seems a better way to handle this is to rebase marvell onto WD's > >master and push that to the marvell tree, allowing Michael to rebase > >his patches onto that version. It seems there should not be a merge > >here. > > that should work too. but my patcheset v9 should apply cleanly > regardless of which way you choose. > > michael > > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot