From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2024 21:02:21 +0000 (-0700)
Subject: Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg... 
X-Git-Tag: v6.9-rc5~14
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Flinux.git;a=commitdiff_plain;h=50a1317fd18acc2793edcb1d078909527c273a9e

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd

Pull iommufd fixes from Jason Gunthorpe:
 "Two fixes for the selftests:

   - CONFIG_IOMMUFD_TEST needs CONFIG_IOMMUFD_DRIVER to work

   - The kconfig fragment sshould include fault injection so the fault
     injection test can work"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd: Add config needed for iommufd_fail_nth
  iommufd: Add missing IOMMUFD_DRIVER kconfig for the selftest
---

50a1317fd18acc2793edcb1d078909527c273a9e