From: Linus Torvalds Date: Thu, 24 Apr 2014 16:57:02 +0000 (-0700) Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... X-Git-Tag: firefly_0821_release~176^2~4002 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fdd324aa5fcaf3cc82f71bde51bf884436c9a986;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/libata Pull libata fixes from Tejun Heo: "Dan updated tag allocation to accomodate devices which choke when tags jump back and forth. Quite a few ahci MSI related fixes. A couple config dependency fixes and other misc fixes" * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata/ahci: accommodate tag ordered controllers ahci: Do not receive interrupts sent by dummy ports ahci: Use pci_enable_msi_exact() instead of pci_enable_msi_range() ahci: Ensure "MSI Revert to Single Message" mode is not enforced ahci: do not request irq for dummy port pata_samsung_cf: fix ata_host_activate() failure handling pata_arasan_cf: fix ata_host_activate() failure handling ata: fix i.MX AHCI driver dependencies pata_at91: fix ata_host_activate() failure handling libata: Update queued trim blacklist for M5x0 drives libata: make AHCI_XGENE depend on PHY_XGENE --- fdd324aa5fcaf3cc82f71bde51bf884436c9a986