[parisc-linux] 2.4.0 merge mangle our tree?

[Matthew Wilcox]

On Wed, Jan 24, 2001 at 07:46:40PM -0800, Grant Grundler wrote:
> Hi Matthew,
> 
> I did 'cvs co -D "1/24/2001 09:00 MST" linux' in order to pick
> up the bits before the 2.4.0 "First take" commit.

ok, the answer seems to be `don't do that then'.  i get a buildable tree
by doing `cvs co linux; cd linux; cvs up -rLINUS_240_PREMERGE'.  I also
get a buildable tree by doing `cvs up -r LINUS_240_FIXUP'.  One is before
the merge and one is after.

sorry for stuffing up the merge :-(  ironic that i was trying to avoid
inconveniencing people...

> Tried "cvs update -rLINUS_240_PREMERGE" and that seemed to do what
> I think I wanted. But backs out a few recent changes. *sigh*.

err... which changes are those?  The sys32_select change richard made
just before i started breaking the tree looks like it's there. I guess
the change to sim700 that richard made won't be there, but as long as we
get this mess sorted out soon, it isn't going to be a big deal to find it.

-- 
Revolutions do not require corporate support.