> -----Original Message----- > From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] > Sent: Saturday, June 18, 2011 11:16 AM > To: Prafulla Wadaskar > Cc: u-boot@lists.denx.de > Subject: Re: Pull request u-boot-marvell.git > > (resent as this was not sent to the list, sorry Prafulla for the > duplicate) > > Hi Prafulla, > > Le 16/06/2011 13:23, Prafulla Wadaskar a écrit : > > Hi Albert > > > > Please kindly pull > > > > The following changes since commit > 7b2fac7654f7420c2787f74ec3b1540fa3b343e9: > > Aneesh V (1): > > omap730p2: fix build breaks > > > > are available in the git repository at: > > > > u-boot-marvell.git next branch. > > Are these meant for this release, i.e. should I pull that in > u-boot-arm/master? If so, can you please rebase your master branch onto > your next branch? Next is supposed to hold commits waiting for next > merge window.
Hi Albert By default they should go in next release that's why I put them in next branch Regards.. Prafulla . . > > Also: > > uboot@lilith:~/src/u-boot-arm$ git fetch u-boot-marvell > remote: error: refs/remotes/origin/mkimage does not point to a valid > object! > remote: Counting objects: 88, done. > remote: Compressing objects: 100% (38/38), done. > remote: Total 68 (delta 51), reused 38 (delta 29) > Unpacking objects: 100% (68/68), done. > From git://git.denx.de/u-boot-marvell > + 0b41af5...7b2fac7 master -> u-boot-marvell/master (forced > update) > + 02e1082...7e481f6 next -> u-boot-marvell/next (forced update) > uboot@lilith:~/src/u-boot-arm$ > > Anyone know what the error message about refs/remote/origin/mkimage > means? > > Amicalement, > -- > Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
