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-x86_64-fedora.config | |
| parent | 5f6821e64b46390c2d8cf681e0ac8ed06f529915 (diff) | |
| parent | 843ad10b79a8949e19d62514ab679a147d84670e (diff) | |
| download | kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.tar.gz kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.tar.xz kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.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-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d4fbd1633..4f4775ee0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -240,6 +240,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y @@ -2709,6 +2710,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y |