diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-11 06:26:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-11 06:26:23 +0200 |
| commit | ae00f5031ceab9a92fc5b2a8acf15093b601ed1f (patch) | |
| tree | ea61bb458da11ea23ea427eafc8242d6453f522a /kernel-s390x-rhel.config | |
| parent | 5f6821e64b46390c2d8cf681e0ac8ed06f529915 (diff) | |
| parent | 843ad10b79a8949e19d62514ab679a147d84670e (diff) | |
| download | kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc33.tar.gz kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc33.tar.xz kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc33.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc36kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc35kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc34kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.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 3419f80c0..4080b3ead 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -166,6 +166,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2213,6 +2214,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set |