xfs
[Top] [All Lists]

Re: ANNOUCEMENT: XFS support to the -mjc 2.4.17 branch (fwd)

To: Eric Sandeen <sandeen@xxxxxxx>
Subject: Re: ANNOUCEMENT: XFS support to the -mjc 2.4.17 branch (fwd)
From: Shawn Starr <spstarr@xxxxxxxx>
Date: 10 Jan 2002 09:44:27 -0500
Cc: xfs <linux-xfs@xxxxxxxxxxx>
In-reply-to: <Pine.LNX.4.33.0201092322070.31478-100000@xxxxxxxxxxxxxxxxxxxxxxxx>
References: <Pine.LNX.4.33.0201092322070.31478-100000@xxxxxxxxxxxxxxxxxxxxxxxx>
Sender: owner-linux-xfs@xxxxxxxxxxx
Yes, But now I have to catch up to his latest tree (mjc3p2) so I have
some work to do :-)

On Thu, 2002-01-10 at 00:22, Eric Sandeen wrote:
> Right... so mergetrees had a conflict here, and you resolved it by moving
> VM_MAX_MAP_COUNT - right?
> 
> On Thu, 10 Jan 2002, Shawn Starr wrote:
> 
> >
> > Well, one such change happened with riel's rmap:
> >
> > specifically:
> >
> > include/linux/sysctrl.h:
> >
> > #if defined(CONFIG_PAGE_BUF) || defined(CONFIG_PAGE_BUF_MODULE)
> >         VM_PAGEBUF=11,          /* XXX: XFS Requires this -- Shawn Star */
> > #endif
> >
> > VM_MAX_MAP_COUNT was set to 11 causing a problem ;-) so I moved his to 14.
> >
> > Shawn.
> >
> > On Wed, 9 Jan 2002, Eric Sandeen wrote:
> >
> > > It creates the dest dir... you should not point it anywhere that has
> > > existing code, you'd edit it _after_ you run mergetrees.  Is that what
> > > you're asking?
> > >
> > > I don't think you'll need to #ifdef out any of the xfs changes - they
> > > should coexist happily with any other code, AFAIK... unless you have a
> > > specific reason to do a bunch of ifdefs, I wouldn't think it's worth the
> > > effort.
> > >
> > > -Eric
> > >
> > > On Wed, 9 Jan 2002, Shawn Starr wrote:
> > >
> > > >
> > > > Running it now.. this looks interesting..
> > > >
> > > > mergetrees -x CVS linux-2.4-xfs/linux linux-vanilla linux-mjc 
> > > > test-mjc-xfs
> > > >
> > > > though, in my dest directory i may need to #ifdef XFS code for non-XFS
> > > > users.
> > > >
> > > > will it ignore my changes in the dest dir or overwrite them?
> > > >
> > > > Shawn.
> > > >
> > > > On Wed, 9 Jan 2002, Eric Sandeen wrote:
> > > >
> > > > > Just do a google search for it.
> > > > >
> > > > > If you have 3 trees, a "parent" tree, and 2 trees that have descended 
> > > > > from
> > > > > it (like, say, the linux-xfs tree and the linux-jfs tree, for 
> > > > > example) you
> > > > > do:
> > > > >
> > > > > mergetrees linux-xfs linux-vanilla linux-jfs linux-xfs-jfs
> > > > >
> > > > > and it will put together the linux-xfs-jfs tree.  you still have to
> > > > > hand-edit any merges it can't handle, but it does a pretty good job, 
> > > > > and
> > > > > all the ocnflicts are _in_ the file, so you can edit fairly easily.
> > > > >
> > > > > -Eric
> > > > >
> > > > > On Wed, 9 Jan 2002, Shawn Starr wrote:
> > > > >
> > > > > >
> > > > > > Not heard of that program, I do know that REJECTS would be generated
> > > > > > because of the differences in the non 2.4.x vanilla tree vs -mjc.
> > > > > >
> > > > > > Shawn.
> > > > > >
> > > > > > On Wed, 9 Jan 2002, Eric Sandeen wrote:
> > > > > >
> > > > > > > Hm, I don't think that's an option, but you could hook it into 
> > > > > > > the TAKE
> > > > > > > emails.
> > > > > > >
> > > > > > > OTOH, as keith pointed out, you can batch things fairly well with 
> > > > > > > the
> > > > > > > split patches.
> > > > > > >
> > > > > > > Also... have you seen mergetrees?  it's an indispensable tool 
> > > > > > > when we do
> > > > > > > tree merging.
> > > > > > >
> > > > > > > -Eric
> > > > > > >
> > > > > > > On Wed, 9 Jan 2002, Shawn Starr wrote:
> > > > > > >
> > > > > > > > looking at cvsweb right now ;-)
> > > > > > > >
> > > > > > > > Is there an option to see the latest changes within cvsweb?
> > > > > > > >
> > > > > > > > Shawn.
> > > > > > > >
> > > > > > > > On Wed, 9 Jan 2002, Eric Sandeen wrote:
> > > > > > > >
> > > > > > > > > Well, it would not be too hard to set things up to mail you a 
> > > > > > > > > set of diffs
> > > > > > > > > each day, if you'd like.  cvsweb also makes it easy to get 
> > > > > > > > > diffs, perhaps
> > > > > > > > > you could use Russell's script.
> > > > > > > > >
> > > > > > > > > -Eric
> > > > > > > > >
> > > > > > > > > On Wed, 9 Jan 2002, Shawn Starr wrote:
> > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > Well, i have my 2.4.18-pre1-mjc3p1-xfs branch which contans 
> > > > > > > > > > a whole bunch
> > > > > > > > > > of other patches (preempting + ide + riel's rmap patch and 
> > > > > > > > > > others). I
> > > > > > > > > > basically have to manually edit the files to make sure I 
> > > > > > > > > > dont break
> > > > > > > > > > anything ;)
> > > > > > > > > >
> > > > > > > > > > But dont have a complete list of all the TAKEs and how many 
> > > > > > > > > > files got
> > > > > > > > > > modified (unless i captured a cvs update | tee file).
> > > > > > > > > >
> > > > > > > > > > Shawn.
> > > > > > > > > >
> > > > > > > > > > On Wed, 9 Jan 2002, Eric Sandeen wrote:
> > > > > > > > > >
> > > > > > > > > > > > I wish there was an easier way to merge the diffs with 
> > > > > > > > > > > > linux-2.4-xfs/linux
> > > > > > > > > > > > with my tree (pre -mjcX-xfs)
> > > > > > > > > > >
> > > > > > > > > > > Hi Shawn -
> > > > > > > > > > >
> > > > > > > > > > > How are you doing it now?
> > > > > > > > > > >
> > > > > > > > > > > -Eric
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > > >
> > > > >
> > > >
> > >
> > >
> > >
> >
> 
> 



<Prev in Thread] Current Thread [Next in Thread>