Bjorn Helgaas 3a48dc6fc2 Merge branch 'pci/virtualization' ... - To avoid bus errors, enable PASID only if entire path supports End-End TLP prefixes (Sinan Kaya) - Unify slot and bus reset functions and remove hotplug knowledge from callers (Sinan Kaya) - Add Function-Level Reset quirks for Intel and Samsung NVMe devices to fix guest reboot issues (Alex Williamson) - Add function 1 DMA alias quirk for Marvell 88SS9183 PCIe SSD Controller (Bjorn Helgaas) * pci/virtualization: PCI: Add function 1 DMA alias quirk for Marvell 88SS9183 PCI: Delay after FLR of Intel DC P3700 NVMe PCI: Disable Samsung SM961/PM961 NVMe before FLR PCI: Export pcie_has_flr() PCI: Rename pci_try_reset_bus() to pci_reset_bus() PCI: Deprecate pci_reset_bus() and pci_reset_slot() functions PCI: Unify try slot and bus reset API PCI: Hide pci_reset_bridge_secondary_bus() from drivers IB/hfi1: Use pci_try_reset_bus() for initiating PCI Secondary Bus Reset PCI: Handle error return from pci_reset_bridge_secondary_bus() PCI/IOV: Tidy pci_sriov_set_totalvfs() PCI: Enable PASID only if entire path supports End-End TLP prefixes # Conflicts: # drivers/pci/hotplug/pciehp_hpc.c		2018-08-15 14:59:06 -05:00
..
asm-generic	Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 21:02:18 -07:00
drm	drm/tegra: Changes for v4.18-rc1	2018-05-22 10:45:43 +10:00
linux	Merge branch 'pci/virtualization'	2018-08-15 14:59:06 -05:00
misc	ocxl: Add an IOCTL so userspace knows what OCXL features are available	2018-06-03 20:40:32 +10:00
mtd
rdma	Verbs flow counters support	2018-06-04 08:48:11 -06:00
scsi
sound	ASoC: Updates for v4.18	2018-06-05 16:51:55 +02:00
video
xen	xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE	2018-05-14 15:25:37 +02:00