On Sun, Jun 6, 2010 at 9:18 PM, Matt Turner <mattst88@xxxxxxxxx> wrote: > Hi Linus, > Please pull the for-linus branch of my tree. It contains a patch > that's been on the mailing list since February that I've overlooked at > least twice, including this merge window. Sorry about that. It's > pretty simple, so it shouldn't cause any problems. > > The other two changes are fixes for very obvious screw-ups, whose > breaking commits were clearly not even compile-tested, nor were they > mailed to linux-alpha@ or any of the Alpha maintainers. > > Thanks! > Matt > > The following changes since commit e44a21b7268a022c7749f521c06214145bd161e4: > Linus Torvalds (1): > Linux 2.6.35-rc2 > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6.git for-linus > > Matt Turner (2): > alpha: fix __arch_hweight32 typo > alpha: fix pci_mmap_resource API breakage > > Morten Holst Larsen (1): > alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19 > > arch/alpha/include/asm/bitops.h | 2 +- > arch/alpha/kernel/Makefile | 20 ++++---- > arch/alpha/kernel/ns87312.c | 38 ----------------- > arch/alpha/kernel/pc873xx.c | 88 +++++++++++++++++++++++++++++++++++++++ > arch/alpha/kernel/pc873xx.h | 35 +++++++++++++++ > arch/alpha/kernel/pci-sysfs.c | 4 +- > arch/alpha/kernel/sys_sio.c | 23 ++++++++++- > 7 files changed, 158 insertions(+), 52 deletions(-) > delete mode 100644 arch/alpha/kernel/ns87312.c > create mode 100644 arch/alpha/kernel/pc873xx.c > create mode 100644 arch/alpha/kernel/pc873xx.h > Don't pull this. There's a better fix for the PCI breakage. I assume you didn't pull this because of the Super IO patch? Assuming it is, I understand, but it's for AlphaStation 255s. Getting that patch into -rc1 isn't going to get us any more testers for such hardware. It's my fault that it didn't make it in this merge window pull request or even the last. I totally forgot about it. Please let me know if it's alright to resent the pull request with the same contents but a better fix for the PCI. Thanks, Matt -- To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
