diff options
| author | dd <91662885+dd010101@users.noreply.github.com> | 2024-05-25 17:48:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-25 17:48:38 +0200 |
| commit | 196e3e8b55b83710c867632131a4129971d1e5b7 (patch) | |
| tree | 64700c37c609b19951a5d414f9a622b7788e67a1 /packages/linux-kernel | |
| parent | 9b5161b074eea6e5395bab4d984cec92434d503f (diff) | |
| parent | cc9d1af8b7f3b2b4b76d9b4a3bcf151b841074dc (diff) | |
| download | vyos-build-196e3e8b55b83710c867632131a4129971d1e5b7.tar.gz vyos-build-196e3e8b55b83710c867632131a4129971d1e5b7.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'packages/linux-kernel')
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig index a6686090..019d0283 100644 --- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig @@ -5319,7 +5319,7 @@ CONFIG_VFIO=m CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m -# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_VIRQFD=y # diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index dce06ec8..02af06ee 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -4982,7 +4982,7 @@ CONFIG_VFIO=m CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m -# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_VIRQFD=y # |