diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-07 15:53:01 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-07 15:53:01 +0100 |
| commit | 442ebd056bbf1b8d77211202c80dd63cdbc7a25d (patch) | |
| tree | 66a1d2acfdd01ef76eef481bc114a912ada93d4f /kernel-s390x-rhel.config | |
| parent | 3658225583bb76328fca99e101929acaec785aef (diff) | |
| parent | 41fdcbd07edcf0f918042b657707f922d0494815 (diff) | |
| download | kernel-442ebd056bbf1b8d77211202c80dd63cdbc7a25d.tar.gz kernel-442ebd056bbf1b8d77211202c80dd63cdbc7a25d.tar.xz kernel-442ebd056bbf1b8d77211202c80dd63cdbc7a25d.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc3.89.vanilla.1.fc35kernel-5.17.0-0.rc3.89.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ef7bf3ec6..f692c1449 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -221,6 +221,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y +# CONFIG_ARM64_ERRATUM_2077057 is not set CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y @@ -1531,6 +1532,7 @@ CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAME_POINTER is not set @@ -2064,8 +2066,8 @@ CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB is not set CONFIG_INFINIBAND_IRDMA=m -# CONFIG_INFINIBAND_ISER is not set -# CONFIG_INFINIBAND_ISERT is not set +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m # CONFIG_INFINIBAND_MTHCA is not set # CONFIG_INFINIBAND_OCRDMA is not set |