Skip to content
  1. Jan 17, 2009
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · e58d4fd8
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        sata_fsl: Return non-zero on error in probe()
        drivers/ata/pata_ali.c: s/isa_bridge/ali_isa_bridge/ to fix alpha build
        libata: New driver for OCTEON SOC Compact Flash interface (v7).
        libata: Add another column to the ata_timing table.
        sata_via: Add VT8261 support
        pata_atiixp: update port enabledness test handling
        [libata] get-identity ioctl: Fix use of invalid memory pointer
      e58d4fd8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · a11d9b62
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] Skip deleted devices in __scsi_device_lookup_by_target()
        [SCSI] Add SUN Universal Xport to no attach blacklist
        [SCSI] iscsi_tcp: make padbuf non-static
        [SCSI] mpt fusion: Add Firmware debug support
        [SCSI] mpt fusion: Add separate msi enable disable for FC,SPI,SAS
        [SCSI] mpt fusion: Update MPI Headers to version 01.05.19
        [SCSI] qla2xxx: Fix ISP restart bug in multiq code
      a11d9b62
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 4c44323d
      Linus Torvalds authored
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/i915: lock correct mutex around object unreference.
        drm/i915: add support for physical memory objects
        drm/i915: make LVDS fixed mode a preferred mode
        drm: handle depth & bpp changes correctly
        drm: initial KMS config fixes
        drm/i915: setup sarea properly in master_priv
        drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
        drm/i915: don't enable vblanks on disabled pipes
      4c44323d
    • Linus Torvalds's avatar
      Revert "PCI PM: Register power state of devices during initialization" · 50246dd4
      Linus Torvalds authored
      This reverts commit 98e6e286
      
      , as Yinghai
      Lu reports that it breaks kexec with at least the e1000 and e1000e
      drivers.  The reason is that the shutdown sequence puts the hardware
      into D3 sleep, and the commit causes us to claim that it then is in D0
      (running) state just because we don't understand the PM capabilities.
      
      Which then later makes "pci_set_power_state()" not do anything, and the
      device never wakes up properly and just returns 0xff to everything.
      
      Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
      Acked-by: default avatarFrom: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: Jesse Barnes <jesse.barnes@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      50246dd4
  2. Jan 16, 2009