Merge branches 'for-6.2/block' and 'for-next' into for-next

* for-6.2/block:
  ABI: sysfs-bus-pci: add documentation for p2pmem allocate
  PCI/P2PDMA: Allow userspace VMA allocations through sysfs
  block: set FOLL_PCI_P2PDMA in bio_map_user_iov()
  block: set FOLL_PCI_P2PDMA in __bio_iov_iter_get_pages()
  lib/scatterlist: add check when merging zone device pages
  block: add check when merging zone device pages
  iov_iter: introduce iov_iter_get_pages_[alloc_]flags()
  mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages
  mm: allow multiple error returns in try_grab_page()

* for-next:

diff --cc mm/huge_memory.c
Simple merge