diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
| commit | 7e94b9d93d2b0133f198cfb7315fdb011cdc21bf (patch) | |
| tree | 07ca66d809cd994bf470f4a0692d5e84e7be31fb /kernel-s390x-rhel.config | |
| parent | b006d4c8a7650c95a1504f20f82569221ad8db24 (diff) | |
| parent | 45d4c5a623b7a0f6aeb373f4760dd0ce4d841942 (diff) | |
| download | kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.tar.gz kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.tar.xz kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc4.5.vanilla.2.fc34kernel-5.9.0-0.rc4.5.vanilla.2.fc33kernel-5.9.0-0.rc4.5.vanilla.2.fc32kernel-5.9.0-0.rc4.5.vanilla.2.fc31
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 fe6771356..a27af74b6 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5834,6 +5834,7 @@ CONFIG_VIDEO_HDPVR=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_HI556 is not set +# CONFIG_VIDEO_IMX214 is not set # CONFIG_VIDEO_IMX219 is not set # CONFIG_VIDEO_IMX258 is not set # CONFIG_VIDEO_IMX274 is not set @@ -6030,6 +6031,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_XEN_PVHVM=y CONFIG_XEN_SCRUB_PAGES_DEFAULT=y # CONFIG_XEN_SCSI_FRONTEND is not set +# CONFIG_XEN_UNPOPULATED_ALLOC is not set CONFIG_XFRM_INTERFACE=m CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_OFFLOAD=y |