Linux PARISC architecture development
 help / color / mirror / Atom feed
From: Matthew Wilcox <matthew@wil.cx>
To: parisc-linux@parisc-linux.org
Subject: [parisc-linux] 2.6.16-rc1 merge
Date: Tue, 17 Jan 2006 08:06:25 -0700	[thread overview]
Message-ID: <20060117150625.GG19769@parisc-linux.org> (raw)


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

             reply	other threads:[~2006-01-17 15:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-17 15:06 Matthew Wilcox [this message]
2006-01-17 15:18 ` [parisc-linux] 2.6.16-rc1 merge Kyle McMartin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060117150625.GG19769@parisc-linux.org \
    --to=matthew@wil.cx \
    --cc=parisc-linux@parisc-linux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox