From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [parisc-linux] 2.6.16-rc1 merge Date: Tue, 17 Jan 2006 08:06:25 -0700 Message-ID: <20060117150625.GG19769@parisc-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: parisc-linux@parisc-linux.org Return-Path: List-Id: parisc-linux developers list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: parisc-linux-bounces@lists.parisc-linux.org 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. _______________________________________________ parisc-linux mailing list parisc-linux@lists.parisc-linux.org http://lists.parisc-linux.org/mailman/listinfo/parisc-linux