summary refs log tree commit diff
path: root/drivers/pci/host/Makefile
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-08-01 12:32:13 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-08-01 12:32:13 -0500
commita04bee8285a71cdbb9076c3dc38be1f0b9a6b4b3 (patch)
tree48b3b1d3f0a0fb63abebfee48ff6c2a560d8aeda /drivers/pci/host/Makefile
parentea1f4e9d1daf87c08ec399669300ee5d1fb68e89 (diff)
parent76f6386b25cc2359a547750b5d128ddab3c43cfb (diff)
parent3a928e98a833e1a470a60d2fedf3c55502185fb7 (diff)
parent991bfef82f17194fe2a2f161b9552d9633ff21b9 (diff)
parent0c6e617f656ec259162a41c0849e3a7557c99d95 (diff)
parent9c2053040ca7ae52f1143a47ae84502aa7970438 (diff)
parentcec6dba24b42fec76820d0ad01b6480c9c81d764 (diff)
downloadlinux-a04bee8285a71cdbb9076c3dc38be1f0b9a6b4b3.tar.gz
Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-dra7xx', 'pci/host-hv', 'pci/host-vmd' and 'pci/host-xilinx' into next
* pci/host-aardvark:
  arm64: dts: marvell: Add Aardvark PCIe support for Armada 3700
  PCI: aardvark: Add Aardvark PCI host controller driver
  dt-bindings: add DT binding for the Aardvark PCIe controller

* pci/host-altera:
  PCI: altera: Poll for link up status after retraining the link
  PCI: altera: Check link status before retrain link
  PCI: altera: Reorder read/write functions

* pci/host-dra7xx:
  PCI: dra7xx: Fix return value in case of error

* pci/host-hv:
  PCI: hv: Fix interrupt cleanup path
  PCI: hv: Handle all pending messages in hv_pci_onchannelcallback()
  PCI: hv: Don't leak buffer in hv_pci_onchannelcallback()

* pci/host-vmd:
  x86/PCI: VMD: Separate MSI and MSI-X vector sharing
  x86/PCI: VMD: Use x86_vector_domain as parent domain
  x86/PCI: VMD: Use lock save/restore in interrupt enable path
  x86/PCI: VMD: Initialize list item in IRQ disable
  x86/PCI: VMD: Select device dma ops to override

* pci/host-xilinx:
  PCI: xilinx: Fix return value in case of error

Manually apply changes from pci/demodularize-hosts and
pci/host-request-windows to drivers/pci/host/pci-aardvark.c