On 13/06/2011 22.17, Khem Raj wrote: > On Mon, Jun 13, 2011 at 12:40 PM, Carmelo AMOROSO > <carmelo.amor...@st.com> wrote: >> On 08/06/2011 23.22, Khem Raj wrote: >>> On Wed, Jun 8, 2011 at 2:17 PM, Bernhard Reutner-Fischer >>> <rep.dot....@gmail.com> wrote: >>>> Hi, >>>> >>>> master is now potentially open to >>>> - merge future into master >>>> - merge prelink into master >>>> - merge ldso-future into master >>>> (in this order). >>>> >>>> To do this, ideally one would bring future up to date, then merge it >>>> back into master etc. >>>> >>>> Peter, do you see fit to >>>> $ git checkout future >>>> $ git pull --rebase (provided future is a proper tracking branch) >>>> $ git push -v >>>> $ git checkout master >>>> $ git merge origin/future >>>> # edit >>>> $ git add some/thing >>>> $ git commit -s some/thing >>>> etc, etc? >>>> >>>> Current future would most likely conflict in e.g. longjmp impl i.e. >>>> would need to be resolved after such merge (and i didn't look, TBH). >>>> >>>> Any takers? Khem, do you have time to explain and resolve that with >>>> peter? Anybody else? >>> >>> I can merge the future branch into master carefully >>> and also some patches that are on hold. >>> >>> Carmelo >>> >>> I think prelink branch should probably be merged in first. >>> >>> Thanks >>> -Khem >> >> Hi guys, >> sorry I was off from uClibc dev for a while... yes I'd prefer to merge >> prelink before, because it's just touch ldso stuff. >> >> Prelink has been merge with master multiple times, so it is almost >> up-to-date. I'll re-merge again, and if you agree, I can merge it back >> to master. >> > > Carmelo > > Yes thats my preference too. So please go ahead and I will wait >
Hi, I've merge prelink with master, solved few conflicts and tested. I'm going to push prelink. Then I'll take care of merging it back to master. ok to proceed ? Cheers, Carmelo >> Carmelo >> >> >>> ________ >> >> >> _______________________________________ >>> uClibc mailing list >>> uClibc@uclibc.org >>> http://lists.busybox.net/mailman/listinfo/uclibc >>> >> >> _______________________________________________ >> uClibc mailing list >> uClibc@uclibc.org >> http://lists.busybox.net/mailman/listinfo/uclibc >> > _______________________________________________ uClibc mailing list uClibc@uclibc.org http://lists.busybox.net/mailman/listinfo/uclibc