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-rhel.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-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 3f68905ea..fcf48c176 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -938,7 +938,8 @@ CONFIG_CUSE=m # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y CONFIG_CXL_BUS=y -# CONFIG_CXL_MEM is not set +CONFIG_CXL_MEM=m +# CONFIG_CXL_MEM_RAW_COMMANDS is not set # CONFIG_CYCLADES is not set # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2796,7 +2797,6 @@ CONFIG_MDIO_MSCC_MIIM=m # CONFIG_MDIO_MVUSB is not set CONFIG_MDIO_OCTEON=m CONFIG_MDIO_THUNDER=m -# CONFIG_MDIO_XPCS is not set CONFIG_MD_LINEAR=m # CONFIG_MD_MULTIPATH is not set CONFIG_MD_RAID0=m |