diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-05 11:03:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-05 11:03:16 +0200 |
| commit | f3ab93fe13027d2bfeaa0d69c382f0901fff814f (patch) | |
| tree | 1836611ec25ec37a4de0eeff9f84ad58099ef03a /kernel-s390x-rhel.config | |
| parent | bf4688151f99adc8ec54d49b41eae1c573cb5dd5 (diff) | |
| parent | 26518b2cca22452e05e13386e82c7b0fc977535d (diff) | |
| download | kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.tar.gz kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.tar.xz kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc4.31.vanilla.1.fc38kernel-6.0.0-0.rc4.31.vanilla.1.fc37kernel-6.0.0-0.rc4.31.vanilla.1.fc36kernel-6.0.0-0.rc4.31.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d6ca71b49..a24f27dc2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1943,7 +1943,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3588,7 +3588,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4149,7 +4149,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set |