diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-24 20:30:08 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-24 20:30:08 +0100 |
commit | 41367e14f95fd5673ac6a19db0153b63d3eea943 (patch) | |
tree | c0ce6ae4d8f4c7b193e68484714f12877a77aa41 /kernel-s390x-rhel.config | |
parent | b6bedeb9dc6ff7e9d61006f639a79c035cf247e4 (diff) | |
parent | 103b0e263c265847c083eb1397b756daaa7d4fd0 (diff) | |
download | kernel-41367e14f95fd5673ac6a19db0153b63d3eea943.tar.gz kernel-41367e14f95fd5673ac6a19db0153b63d3eea943.tar.xz kernel-41367e14f95fd5673ac6a19db0153b63d3eea943.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc5.20230124git7bf70dbb1882.39.vanilla.1.fc38kernel-6.2.0-0.rc5.20230124git7bf70dbb1882.39.vanilla.1.fc37kernel-6.2.0-0.rc5.20230124git7bf70dbb1882.39.vanilla.1.fc36
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ccc178a85..cf5ad640a 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4643,7 +4643,7 @@ CONFIG_RV_REACT_PANIC=y CONFIG_RV_REACT_PRINTK=y CONFIG_RV=y CONFIG_RXKAD=y -# CONFIG_RXPERF is not set +CONFIG_RXPERF=m CONFIG_S390_AP_IOMMU=y CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST=y @@ -4842,7 +4842,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_PATH is not set +CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y |