The following commit has been merged in the master branch: commit d4562267b995fa3917717cc7773dad9c1f1ca658 Merge: 89970a04d70c6c9e5e4492fd4096c0b5630a478c 9abb27c7594a62bbf6385e20b7f5a90b4eceae2f Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Mar 30 15:08:38 2017 -0700

Merge tag 'pci-v4.11-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

- fix iProc memory corruption

- fix ThunderX usage of unregistered PNP/ACPI ID

- fix ThunderX resource reservation on early firmware

* tag 'pci-v4.11-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: thunder-pem: Add legacy firmware support for Cavium ThunderX host controller PCI: thunder-pem: Use Cavium assigned hardware ID for ThunderX host controller PCI: iproc: Save host bridge window resource in struct iproc_pcie