diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-09 18:11:41 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-09 18:11:41 +0100 |
commit | 0381175c930d9ad6d891fc3fbf595ecb61298550 (patch) | |
tree | 36cfaeaa1dfcbbb286bcd14ceb98dca069168216 /kernel-aarch64-debug-rhel.config | |
parent | a64fbf6eb8a2264b64e199062e7d2fbbca6cf516 (diff) | |
parent | 863d61daf8bb1eb7b271dc8a4ccc12a6289e987c (diff) | |
download | kernel-0381175c930d9ad6d891fc3fbf595ecb61298550.tar.gz kernel-0381175c930d9ad6d891fc3fbf595ecb61298550.tar.xz kernel-0381175c930d9ad6d891fc3fbf595ecb61298550.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.vanilla.1.fc36kernel-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.vanilla.1.fc35kernel-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.vanilla.1.fc34kernel-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.vanilla.1.fc33
Diffstat (limited to 'kernel-aarch64-debug-rhel.config')
-rw-r--r-- | kernel-aarch64-debug-rhel.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index bb406f1e7..a6800173a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3977,6 +3977,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6932,7 +6933,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set |