[parisc-linux] 2.6.16-rc1 merge
Matthew Wilcox
matthew at wil.cx
Tue Jan 17 08:06:25 MST 2006
The 2.6.16-rc1 merge was a bit complex, so please check any areas you
feel responsible for to make sure I didn't mess you up.
arch/parisc/kernel/process.c
The merge seems to have undone some of viro's task_stack_page stuff.
I don't think this was deliberate, needs checking.
drivers/parisc/pdc_stable.c
I think I just took Thibaut's newest version for everything here.
drivers/scsi/constants.c
drivers/scsi/ncr53c8xx.c
drivers/scsi/ncr53c8xx.h
drivers/scsi/sym53c8xx_2/sym_glue.c
drivers/scsi/sym53c8xx_2/sym_glue.h
drivers/scsi/sym53c8xx_2/sym_hipd.c
I'll take care of these; they're all my fault.
include/sound/opl3.h
sound/drivers/opl3/opl3_lib.c
sound/pci/Kconfig
sound/pci/ad1889.c
Stuart, please look. It was all very complicated, and I'm not convinced
I haven't missed some cleanups necessary on error paths.
kernel/compat.c
I kept our version of compat_sys_timer_create. Someone please test the
upstream version works.
More information about the parisc-linux
mailing list