diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-17 06:17:21 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-17 06:17:21 +0100 |
commit | d939dcd890ee67333ff86d53e85fac8e5a57a66f (patch) | |
tree | 1b68c7a067f5f5a4c9308a50f0316ead31bef2ce /kernel-s390x-zfcpdump-rhel.config | |
parent | 021cd0f00c53b105dbd5eb24d52d03d33b16c659 (diff) | |
parent | c840fdeb4a5c4e1565c41454115d441d30c1000b (diff) | |
download | kernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc35.tar.gz kernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc35.tar.xz kernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc35.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc36kernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc35kernel-5.16.0-0.rc5.20211216git2b14864acbaa.37.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ab837e9ec..be87d943e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6459,8 +6459,8 @@ CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_SGX_KVM=y -CONFIG_XDP_SOCKETS_DIAG=y -CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m +# CONFIG_XDP_SOCKETS is not set # CONFIG_XEN_BACKEND is not set # CONFIG_XEN_GRANT_DMA_ALLOC is not set CONFIG_XEN_PRIVCMD=m |