Message ID | 1310998052-14615-1-git-send-email-s-paulraj@ti.com |
---|---|
State | Accepted |
Headers | show |
(sorry Sandeep for the duplicate) Le 18/07/2011 16:07, s-paulraj@ti.com a écrit : > Albert, > > Please pull u-boot-ti/master. I am working on some other patches from > Aneesh as well. I will send a pull request for that as well as > remaining u-boot-ti patches in due course of time. > > Regards, > Sandeep > > The following changes since commit 68d4230c3ccce96a72c5b99e48399bf1796fe3c6: > Ramneek Mehresh (1): > powerpc/85xx: Add default usb mode and phy type to hwconfig > > are available in the git repository at: > > git://git.denx.de/u-boot-ti.git master Applied to u-boot-arm/master, thanks! --except for: > Yegor Yefremov (1): > am3517evm: change console device from ttyS2 to ttyO2 ... which I had already applied, see <http://www.mail-archive.com/u-boot@lists.denx.de/msg56644.html>. Note that u-boot-ti still has a tag, "2009.01-rc2", which should be removed from the repository, see <http://www.mail-archive.com/u-boot@lists.denx.de/msg51721.html>. (there is also a "NIOS2-5_0_0" tag which I am not sure of;maybe it should be removed too) Amicalement,
> > Note that u-boot-ti still has a tag, "2009.01-rc2", which should be > removed from the repository, see > <http://www.mail-archive.com/u-boot@lists.denx.de/msg51721.html>. > > (there is also a "NIOS2-5_0_0" tag which I am not sure of;maybe it > should be removed too) > Albert, I regularly rebase with mainline u-boot and these tags are present in mainline u-boot I believe. This is how I have the tags in my repository. Regards, Sandeep
(to : ARM custodians, for action) (cc: Wolfgang and Scott, for info) Hi Sandeep, Le 19/07/2011 17:22, Paulraj, Sandeep a écrit : > > >> >> Note that u-boot-ti still has a tag, "2009.01-rc2", which should be >> removed from the repository, see >> <http://www.mail-archive.com/u-boot@lists.denx.de/msg51721.html>. >> >> (there is also a "NIOS2-5_0_0" tag which I am not sure of;maybe it >> should be removed too) >> > Albert, > > I regularly rebase with mainline u-boot and these tags are present in mainline u-boot I believe. This is how I have the tags in my repository. Actually no, they are not in mainline any more, that's the point of the mail I referred you to. I have just cloned a fresh u-boot, and neither "2009.01-rc2" nor "NIOS2-5_0_0" are in there. The latter was still in u-boot-arm, and there being no reason for it there, I just removed it by 'git push -f ssh://gu-arm@git.denx.de/u-boot-arm :NIOS2-5_0_0' Note that both spurious tags are also present in u-boot-atmel, u-boot-imx, u-boot-marvell, u-boot-pxa, and u-boot-samsung (and possibly others? I only checked the ones I have as remotes) -- custodians added in To: list. Both should be removed, as the NIOS tag should appear only in Scott's u-boot-nios repository (Scott CC:ed for info). Note: rebasing your repo will not 'pull tag removals', i.e. if a tag is removed from a remote it will not automatically be removed from your local repo, and besides, if you remove it locally it will not be removed from your official repo on the denx server unless you explicitly tell 'git push' to do it, like I did. To make sure you are completely rid of a tag, you have to do both a 'git tag -d TAGTOREMOVE' for local removal, and a 'git push ... :TAGTOREMOVE' (or use 'git push --mirror' or 'git push --delete', with care) > Regards, > Sandeep Amicalement,