Commit 50a1317f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 2bf5dd7c 2760c51b
...@@ -37,6 +37,7 @@ config IOMMUFD_TEST ...@@ -37,6 +37,7 @@ config IOMMUFD_TEST
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
depends on FAULT_INJECTION depends on FAULT_INJECTION
depends on RUNTIME_TESTING_MENU depends on RUNTIME_TESTING_MENU
select IOMMUFD_DRIVER
default n default n
help help
This is dangerous, do not enable unless running This is dangerous, do not enable unless running
......
CONFIG_IOMMUFD=y CONFIG_IOMMUFD=y
CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION=y CONFIG_FAULT_INJECTION=y
CONFIG_IOMMUFD_TEST=y CONFIG_IOMMUFD_TEST=y
CONFIG_FAILSLAB=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment