From 71b9685e58da19affb91c28ef47f35283d330f48 Mon Sep 17 00:00:00 2001 From: Kernel Build Daemon Date: May 22 2023 10:21:03 +0000 Subject: Merge branch 'master-vanilla-configs' into linux-next --- diff --git a/config/s390x/vanilla b/config/s390x/vanilla index 0227985..0e11cd7 100644 --- a/config/s390x/vanilla +++ b/config/s390x/vanilla @@ -4138,3 +4138,4 @@ CONFIG_SCSI_IPR_TRACE=y CONFIG_VHOST_TASK=y CONFIG_VIDEO_CMDLINE=y CONFIG_XFS_SUPPORT_ASCII_CI=y +CONFIG_VFIO_CCW=m