Please pull from 'upstream-linus' branch of

master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
 drivers/ata/libata-core.c   |    1 +

 drivers/ata/pata_it821x.c   |    4 ++++

 drivers/ata/pata_via.c      |   14 +++++++++++---

 drivers/ide/pci/via82cxxx.c |    1 +

 include/linux/pci_ids.h     |    1 +

 5 files changed, 18 insertions(+), 3 deletions(-)
Jeff Norden (1):

      pata_it821x: fix lost interrupt with atapi devices
Joseph Chan (1):

      [libata, IDE] add new VIA bridge to VIA PATA drivers
Laurent Riffard (1):

      Fix broken pata_via cable detection
Tejun Heo (1):

      libata clear horkage on ata_dev_init()
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c

index a3ee087..c43de9a 100644

--- a/drivers/ata/libata-core.c

+++ b/drivers/ata/libata-core.c

@@ -6035,6 +6035,7 @@ void ata_dev_init(struct ata_device *dev)

 	 */

 	spin_lock_irqsave(ap->lock, flags);

 	dev->flags &= ~ATA_DFLAG_INIT_MASK;

+	dev->horkage = 0;

 	spin_unlock_irqrestore(ap->lock, flags);
 	memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,

diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c

index ed637ae..5d8b91e 100644

--- a/drivers/ata/pata_it821x.c

+++ b/drivers/ata/pata_it821x.c

@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)

 	struct ata_port *ap = qc->ap;

 	struct it821x_dev *itdev = ap->private_data;
+	/* Only use dma for transfers to/from the media. */

+	if (qc->nbytes < 2048)

+		return -EOPNOTSUPP;

+

 	/* No ATAPI DMA in smart mode */

 	if (itdev->smart)

 		return -EOPNOTSUPP;

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c

index ea18e33..636c4f1 100644

--- a/drivers/ata/pata_via.c

+++ b/drivers/ata/pata_via.c

@@ -97,6 +97,7 @@ static const struct via_isa_bridge {

 	u8 rev_max;

 	u16 flags;

 } via_isa_bridges[] = {

+	{ "vx800",	PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BA...
[ message continues ]