Merge remote-tracking branch 'pci-bjorn/topic/alex-vfio-prep' into groups

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc include/linux/pci.h
Simple merge