diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-29 18:09:05 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-29 18:09:05 +0100 |
commit | d656fcc48d8b13a41be16c7ec477c1f9a0c0d806 (patch) | |
tree | 51beb316dc4cec287b1b58d02cce4418080f4f2c /kernel-s390x-debug-fedora.config | |
parent | 4d0e54bbc16207a52d9e6ccd3e0b0677a9fd6720 (diff) | |
parent | a260e87234a27da05e103107d33f3f47bde88d04 (diff) | |
download | kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.tar.gz kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.tar.xz kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.vanilla.1.fc34kernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.vanilla.1.fc33kernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r-- | kernel-s390x-debug-fedora.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1ee8edf7d..d6cfdc777 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6571,6 +6571,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m +# CONFIG_VDPA_SIM_NET is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m |