DOH! Silly me. :) Thanks for the help. I'll try it out next week and see
what it gets me. Thanks for putting up with me. I'm just trying to do my
part. :)
On Fri, 2002-01-25 at 21:01, Stephen Lord wrote:
> Eric Sandeen wrote:
>
> >On 25 Jan 2002, Austin Gonyou wrote:
> >
> >>Given that I spent a lot of time getting a XFS enabled kernel merged
> >>with -aa series kernel, I'd like to ask if anyone else has tried out
> the
> >>-aa series without XFS? If so, and you have liked what you
> >>see/use/whatever, I'd like to ask SGI if there is a way to work-out
> >>between the XFS tree and -AA tree a possibly easier migration path.
> >>
> >
> >Austin -
> >
> >Rather than just applying the patch directly and dealing with the
> rejects,
> >you might try the "mergetrees" tool to do this, you just do:
> >
> >mergetrees linux-aa/ linux-linus/ linux-xfs/ linux-aa-xfs/
> >
> >and it will merge your aa tree with the xfs tree and produce an aa-xfs
> >tree ("linux-aa,", "linux-linus,", and "linux-xfs" are all the same
> base
> >kernel - say, 2.4.17 - with the -aa or -xfs (or no) patches.)
> >
> >You'll get a list of conflicts, and the conflicts are marked _in_ the
> >source files, making it much easier to resolve.
> >
> >-Eric
> >
> Mergetrees comes from here:
>
> http://cvs.bofh.asn.au/mergetrees/
>
> Steve
>
>
--
Austin Gonyou
Systems Architect, CCNA
Coremetrics, Inc.
Phone: 512-698-7250
email: austin@xxxxxxxxxxxxxxx
"It is the part of a good shepherd to shear his flock, not to skin it."
Latin Proverb
signature.asc
Description: This is a digitally signed message part
|