Michael Ang wrote: > Conflicted files which still need to be manually merged using 'cvs up > -jlinus2329 -jlinus2342' > `drivers/char/serial.c' Done. It should be ok now. grant Grant Grundler Unix Development Lab +1.408.447.7253