Merge branch 'pci/msi-affinity' into next

Conflicts:
	drivers/nvme/host/pci.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/atheros/alx/main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
Simple merge

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