1. 12 May, 2007 33 commits
  2. 11 May, 2007 7 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · c5b7bede
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] iTCO_wdt.c - fix ACPI Base register
      c5b7bede
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · fb2c922b
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_platform: don't use generic ata_port_start
        Use menuconfig objects: libata
        add the ATI SB700 SATA controller device id to AHCI pci table
        Add the combined mode for ATI SB700
        pata_pcmcia: recognize 2GB CompactFlash from Transcend
        git-libata-all: sata_via build fix
        libata-acpi: clean up parameters and misc stuff
        libata-acpi: s/CONFIG_SATA_ACPI/CONFIG_ATA_ACPI/
        libata: give devices one last chance even if recovery failed with -EINVAL
        libata: fallback to the other IDENTIFY on device error, take#2
        libata: ignore EH scheduling during initialization
        libata: clean up SFF init mess
        libata: implement libata.spindown_compat
        libata: reimplement suspend/resume support using sdev->manage_start_stop
      fb2c922b
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 9ce3075c
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (35 commits)
        Add support for the Davicom DM9161A PHY
        sky2: only disable 88e8056 on some boards
        sky2: 88e8071 support not ready
        skge: crash on shutdown/suspend
        sky2: fix oops on shutdown
        mlx4: don't use deprecated IRQ flags
        netxen_nic_main don't use deprecated irq flags
        Use menuconfig objects II - netdev/wan
        Use menuconfig objects II - netdev/pcmcia
        Use menuconfig objects II - netdev/atm
        Use menuconfig objects: netdev
        Use menuconfig objects: PHY
        spidernet: remove unnecessary accesses to phy
        S2IO: Statistics for link up/down and memory allocated/freed
        S2IO: statistics for memory allocation failuers
        S2IO: getringparam ethtool option
        [PATCH] libertas: 64-bit cleanups
        [PATCH] libertas: sparse fixes
        [PATCH] libertas: fix missing unlock in TX error path
        [PATCH] libertas: make debugfs.c sparse-clean
        ...
      9ce3075c
    • David Miller's avatar
      Fix assertion failure with MSI on sparc64 · b3b7cc7b
      David Miller authored
      Today's find is a triggered assertion in msi_free_irqs() when the system
      doesn't support MSI, in which case arch_setup_msi_irqs() always returns
      an error.
      
      The problem is that when this happens we branch into msi_free_irqs(), to
      which you added the following assertion loop:
      
      	list_for_each_entry(entry, &dev->msi_list, list)
      		BUG_ON(irq_has_action(entry->irq));
      
      Well, if arch_setup_msi_irqs() fails, entry->irq will be zero and
      although that's never assigned to any normal devices we use that IRQ
      number for the timer interrupt on sparc64 so this assertion triggers.
      
      Better to test for zero before doing the irq_has_action() assertion
      thing.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b3b7cc7b
    • Olof Johansson's avatar
      pata_platform: don't use generic ata_port_start · b9a3b4d1
      Olof Johansson authored
      I have a system where I have a simple IDE controller that sits on a
      local bus without bus master dma capability, and thus no dma_mapping
      ops defined for the device/bus.
      
      pata_platform works great for me, with the exception of using the generic
      ata_port_start which tries to do a dmam_alloc_coherent.
      
      Looks like it doesn't need to allocate a prd table at all, so replace it
      with a dummy function instead.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      b9a3b4d1
    • Jan Engelhardt's avatar
      Use menuconfig objects: libata · b196fc69
      Jan Engelhardt authored
      Use menuconfigs instead of menus, so the whole menu can be disabled at once
      instead of going through all options.
      Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      b196fc69
    • Henry Su's avatar
      add the ATI SB700 SATA controller device id to AHCI pci table · 2bcfdde6
      Henry Su authored
      Add the device ID to AHCI pci table for ATI SB700 SATA controller, the
      subsequent chipset of SB600.
      
      Signed-off-by: henry su<henry.su@amd.com>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      2bcfdde6