Hi Prafulla, Le 20/06/2011 07:16, Prafulla Wadaskar a écrit :
>> -----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 Still not clear to me -- next release is 2011-06, but next merge window is for *after* 2011-06, and anyway, the U-Boot wiki clearly describes pull reqs as being done on master branches, not next. So: - if you want these commits in for 2011-06, then please move your master to have them in, and send a pull req for master, not next. - if you want them in after 2011-06, then simply wait for the merge window, then move them to your master and issue the pull request. Which is it? Sorry if I seem either convoluted or dense (or both). > Regards.. > Prafulla . . Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
