From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 May 2025 19:09:22 +0000 (-0700)
Subject: Merge tag 'vfio-v6.15-rc6' of https://github.com/awilliam/linux-vfio
X-Git-Tag: v6.15-rc6~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acaa3e726f4a29f32bca5146828565db56bc396f;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'vfio-v6.15-rc6' of https://github.com/awilliam/linux-vfio

Pull vfio fix from Alex Williamson:

 - Fix an issue in vfio-pci huge_fault handling by aligning faults to
   the order, resulting in deterministic use of huge pages.  This
   avoids a race where simultaneous aligned and unaligned faults to
   the same PMD can result in a VM_FAULT_OOM and subsequent VM crash.
   (Alex Williamson)

* tag 'vfio-v6.15-rc6' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Align huge faults to order
---

acaa3e726f4a29f32bca5146828565db56bc396f