diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-02 18:40:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-02 18:40:16 +0200 |
commit | 14aa7b0a49602d464452d6268e9127c7b9c17fae (patch) | |
tree | 820428bc19b025dc727a349bf85a8823c6cdd1aa /kernel-s390x-zfcpdump-rhel.config | |
parent | f251ee1f76e7fcfd2ea2e8f25aacc00447913748 (diff) | |
parent | 55c4292d703849b7e7edee5365196ceed6f8fdc0 (diff) | |
download | kernel-14aa7b0a49602d464452d6268e9127c7b9c17fae.tar.gz kernel-14aa7b0a49602d464452d6268e9127c7b9c17fae.tar.xz kernel-14aa7b0a49602d464452d6268e9127c7b9c17fae.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc4.20210602git231bc5390667.34.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 22adcac71..cf76299a7 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -434,7 +434,7 @@ CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y # CONFIG_BPF_SYSCALL is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_BRCMDBG is not set CONFIG_BRCMFMAC=m @@ -1811,6 +1811,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m +# CONFIG_HID_SEMITEK is not set # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -4110,8 +4111,8 @@ CONFIG_QED_SRIOV=y CONFIG_QETH_L2=m CONFIG_QETH_L3=m CONFIG_QETH=m -CONFIG_QETH_OSN=y -CONFIG_QETH_OSX=y +# CONFIG_QETH_OSN is not set +# CONFIG_QETH_OSX is not set # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QLA3XXX=m @@ -6237,7 +6238,7 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set # CONFIG_VIRTIO_CONSOLE is not set -# CONFIG_VIRTIO_FS is not set +CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set CONFIG_VIRTIO_MENU=y |