OK, I can do the re-merge and get it compiling
if you can take it from there (adding fixes
like the last round).
We really need to have a better way for doing this
though. Any suggestions?
Dan
> -----Original Message-----
> From: Tian, Kevin [mailto:kevin.tian@xxxxxxxxx]
> Sent: Monday, September 12, 2005 9:48 AM
> To: Magenheimer, Dan (HP Labs Fort Collins)
> Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> Subject: RE: [Xen-ia64-devel] Community effort neededtocatch
> upwithxen-unstable
>
> Hi, Dan,
>
> Actually... I gave up. ;-( It's easier to bring back
> previous fixes even when merge process made some regression,
> than manually pull in some specific changesets which
> furthermore require other related ones. Now xen_start_info
> becomes a pointer, and console driver was completely
> re-written to utilize xenstore, and more... So, please begin
> to merge the xenlinux, as a necessary step for subsequent debug. ;-)
>
> Thanks,
> Kevin
>
> >-----Original Message-----
> >From: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
> >[mailto:xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx] On
> Behalf Of Tian, Kevin
> >Sent: 2005年9月12日 22:21
> >To: Magenheimer, Dan (HP Labs Fort Collins)
> >Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >Subject: RE: [Xen-ia64-devel] Community effort neededtocatch
> upwithxen-unstable
> >
> >I've fixed obvious missing features for tools and can pass
> compilation now. However
> >there does have issue with xenlinux-ia64, like ctrl_if has
> been removed completely
> >and also a new xen console page is required now. I'm trying
> to pull in some obvious
> >patches to see whether it works. If failed and hard to make
> up, I'll request your help to
> >merge then.
> >
> >Thanks,
> >Kevin
> >
> >>-----Original Message-----
> >>From: Magenheimer, Dan (HP Labs Fort Collins)
> >[mailto:dan.magenheimer@xxxxxx]
> >>Sent: 2005年9月10日 1:32
> >>To: Tian, Kevin
> >>Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >>Subject: RE: [Xen-ia64-devel] Community effort
> neededtocatch upwithxen-unstable
> >>
> >>OK, I have just merged xen-unstable into xen-ia64-unstable
> >>and made a few fixes so that it compiles and tested it
> >>(by compiling Linux).
> >>
> >>Please try to compile tools and fix problems.
> >>
> >>I don't have any automated way to merge the xen-unstable
> >>driver files into xenlinux and am hesitant to try it
> >>again manually as I might break some of the fixes you
> >>and John recently made, so it would probably be better
> >>if you determine if merging is necessary for the driver
> >>files too.
> >>
> >>Dan
> >>
> >>> -----Original Message-----
> >>> From: Tian, Kevin [mailto:kevin.tian@xxxxxxxxx]
> >>> Sent: Thursday, September 08, 2005 6:26 PM
> >>> To: Magenheimer, Dan (HP Labs Fort Collins); Byrne, John (HP Labs)
> >>> Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >>> Subject: RE: [Xen-ia64-devel] Community effort neededtocatch
> >>> upwithxen-unstable
> >>>
> >>> Ha, yes. At least I see a new extra page required now for xen
> >>> console, just like previous xenstore page. You may need to
> >>> sync xen-ia64-unstable.hg first and I will take a look.
> >>> (Maybe same thing needs for xenlinux-ia64?)
> >>>
> >>> Thanks,
> >>> Kevin
> >>>
> >>>
> >>>
> >>> >-----Original Message-----
> >>> >From: Magenheimer, Dan (HP Labs Fort Collins)
> >>> [mailto:dan.magenheimer@xxxxxx]
> >>> >Sent: 2005年9月9日 5:17
> >>> >To: Tian, Kevin; Byrne, John (HP Labs)
> >>> >Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >>> >Subject: RE: [Xen-ia64-devel] Community effort neededtocatch
> >>> upwithxen-unstable
> >>> >
> >>> >> >> BTW, I'll send out the tools change
> >>> >> >> to xen mailing list, since some common code is changed
> >>> upon ia64.
> >>> >> >
> >>> >> >Yes, it will be interesting to see if it gets in. I hope it
> >>> >> >does, but in the past Keir has been resistant to ifdef code.
> >>> >> >
> >>> >> >Please keep track of it and let us all know if it gets in!
> >>> >>
> >>> >> Yes, too many ifdefs are unacceptable. If the news is bad, we
> >>> >> have to find other way, like trying to catch up with x86
> >>> >> behavior closely to reduce such branches. ;-(
> >>> >
> >>> >Per Keir's response/permission, we can put the patch into
> >>> >xen-ia64-unstable and he will pull it in the next update.
> >>> >
> >>> >First, however, it appears that we are behind again... I tried
> >>> >applying the patch against xen-unstable tip and the patch
> >>> >applied only with many hunk offsets. The result didn't
> >>> >compile (though probably not due to this specific patch).
> >>> >
> >>> >Dan
> >>>
> >
> >_______________________________________________
> >Xen-ia64-devel mailing list
> >Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >http://lists.xensource.com/xen-ia64-devel
>
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|