Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 9e220385
    Linus Torvalds authored
    Pull libata updates from Tejun Heo:
     "Overview of changes:
    
       - The rest of maintainer email address updates.
    
       - Some core updates - more robust default behavior for port
         multipliers, better error reporting for SG_IO commands, and a way
         to better work around now ancient and probably pretty rare PATA ->
         SATA bridges with ATAPI devices.
    
       - sata_rcar stabilization.
    
       - Some hardware PCI ID additions and one-off low level driver
         updates."
    
    * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
      AHCI: use ATA_BUSY
      libata-zpodd: must use ata_tf_init()
      ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
      ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
      libata: cleanup SAT error translation
      ahci: sata: add support for exynos5440 sata
      libata: skip SRST for all SIMG [34]7x port-multipliers
      ahci: remove pmp link online check in FBS EH
      sata highbank: add bit-banged SGPIO driver support
      ahci: make ahci_transmit_led_message into a function pointer
      sata_rcar: fix compilation warning in sata_rcar_thaw()
      sata_highbank: increase retry count but shorten duration for Calxeda controller
      ata: use pci_get_drvdata()
      ipr: qc_fill_rtf() method should not store alternate status register
      sata_rcar: add 'base' local variable to some functions
      sata_rcar: correct 'sata_rcar_sht'
      sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()
      libata: do not limit R-Car SATA driver to shmobile
      ata: use platform_{get,set}_drvdata()
      AHCI: Make distinct names for ports in /proc/interrupts
      ...
    9e220385