diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-10 19:02:18 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-10 19:02:18 +0200 |
commit | 64cec472ef87623e6a8f1a65986bf803ea676f4e (patch) | |
tree | 1db71aae09501adae5b53fad339890400f21c871 /kernel-s390x-zfcpdump-rhel.config | |
parent | 41528fa25d14f0638b6ad9f77b2eced50be8eb53 (diff) | |
parent | e5c1ab6d64e0de0321ee1c62f32f89480e3b8d2d (diff) | |
download | kernel-64cec472ef87623e6a8f1a65986bf803ea676f4e.tar.gz kernel-64cec472ef87623e6a8f1a65986bf803ea676f4e.tar.xz kernel-64cec472ef87623e6a8f1a65986bf803ea676f4e.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc35kernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc34kernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 55a70dbe7..276c819ca 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6269,7 +6269,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMLOGRDR=m CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set -# CONFIG_VP_VDPA is not set +CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m # CONFIG_VSOCKETS is not set CONFIG_VSOCKETS_LOOPBACK=m |