diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-14 07:46:08 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-14 07:46:08 +0200 |
| commit | 9cd7866304b2d5b845de31768b54f7effb5996a7 (patch) | |
| tree | 9ce820144f6942d4414b3b77864d5c4554e0cf73 /kernel-s390x-rhel.config | |
| parent | ae00f5031ceab9a92fc5b2a8acf15093b601ed1f (diff) | |
| parent | cc9d1aabf0c139c531b0d301bfbfb39d9dd5d7d2 (diff) | |
| download | kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.tar.gz kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.tar.xz kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc1.12.vanilla.1.fc36kernel-5.15.0-0.rc1.12.vanilla.1.fc35kernel-5.15.0-0.rc1.12.vanilla.1.fc34kernel-5.15.0-0.rc1.12.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4080b3ead..8292e93fa 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4152,6 +4152,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6365,6 +6366,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m |