diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-17 17:35:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-17 17:35:18 +0200 |
| commit | 788e62fae86e28be8077e5bb62625ee8b0425f81 (patch) | |
| tree | 71ae2ff36eec16ecd8da01f41e493063ae6e7984 /kernel-s390x-fedora.config | |
| parent | 70729eacc5c9a469a47f4ef95dc4791610da5ba3 (diff) | |
| parent | 124eb98dad29a958da9c4a41e456b160c988ac8e (diff) | |
| download | kernel-788e62fae86e28be8077e5bb62625ee8b0425f81.tar.gz kernel-788e62fae86e28be8077e5bb62625ee8b0425f81.tar.xz kernel-788e62fae86e28be8077e5bb62625ee8b0425f81.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc6.20210617git70585216fe77.48.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8aa62ba95..daaf36ddc 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -227,7 +227,6 @@ CONFIG_AR5523=m # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_KEEMBAY is not set @@ -3095,7 +3094,6 @@ CONFIG_MDIO_I2C=m CONFIG_MDIO_MVUSB=m # CONFIG_MDIO_OCTEON is not set # CONFIG_MDIO_THUNDER is not set -CONFIG_MDIO_XPCS=m CONFIG_MD_LINEAR=m CONFIG_MD_MULTIPATH=m CONFIG_MD_RAID0=m @@ -7044,7 +7042,7 @@ CONFIG_WWAN=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX_KVM is not set +CONFIG_X86_SGX_KVM=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set |