Merge branch 'for-7.0/blk-pvec' into for-7.0/block

* for-7.0/blk-pvec:
  types: move phys_vec definition to common header
  nvme-pci: Use size_t for length fields to handle larger sizes

diff --cc block/blk-mq-dma.c
Simple merge

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