Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	drivers/usb/dwc3/dwc3-pci.c

diff --cc drivers/crypto/ccp/ccp-ops.c
Simple merge

diff --cc drivers/media/rc/fintek-cir.c
Simple merge

diff --cc drivers/net/macvtap.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/sdio.c
Simple merge

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

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

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

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

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