[parisc-linux] 2.4.9 merge

Matthew Wilcox willy@debian.org
Fri, 17 Aug 2001 01:30:14 +0100


A few conflicts:

Documentation/parisc/mm got deleted -- we already did this.
Makefile -- obvious conflict
arch/parisc/hpux/fs.c -- off_t changes to loff_t; we added an extra param, which is why upstream's patch doesn't apply.
drivers/char/tty_io.c -- part of our tree got applied
drivers/net/lasi_82596.c -- looks like changes from our tree, someone should check this properly.
drivers/sound/Makefile -- probably trivial haven't looked properly
drivers/video/fbcon-sti.c -- hunk #2 has already been done.
drivers/video/sticon-bmode.c -- now irrelevant
drivers/video/sticore.c -- ditto

that's it.

-- 
Revolutions do not require corporate support.