Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-15 07:32:47 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-15 07:32:47 +0200
commitbf5c01b16b957d1f16c9d43a859d3f8111e2ac16 (patch)
treee5454ab6238ed0faea710264e0f71622af5d1d9b
parentd5bbc2660483667d77c883cdffd78857cc7214b7 (diff)
parent09bdbaf452312e68af024c953632352e5e1abb71 (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--config/x86_64/kvmsmall19
1 files changed, 18 insertions, 1 deletions
diff --git a/config/x86_64/kvmsmall b/config/x86_64/kvmsmall
index b2c5ea0ca0..81bea864c4 100644
--- a/config/x86_64/kvmsmall
+++ b/config/x86_64/kvmsmall
@@ -1,6 +1,7 @@
# CONFIG_60XX_WDT is not set
# CONFIG_6LOWPAN is not set
# CONFIG_ACPI_APEI_GHES is not set
+CONFIG_ACPI_NFIT=y
# CONFIG_ACPI_SBS is not set
# CONFIG_ACPI_THERMAL is not set
# CONFIG_ACQUIRE_WDT is not set
@@ -47,6 +48,7 @@
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_BLK_DEV_NVME is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+CONFIG_BLK_DEV_PMEM=y
# CONFIG_BLK_DEV_RSXX is not set
# CONFIG_BLK_DEV_SKD is not set
# CONFIG_BLK_DEV_SX8 is not set
@@ -124,6 +126,7 @@
# CONFIG_EQUALIZER is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_F71808E_WDT is not set
+CONFIG_FAILOVER=y
# CONFIG_FB_I740 is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_MB862XX is not set
@@ -232,6 +235,7 @@ CONFIG_HWMON=m
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_TPM is not set
# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
# CONFIG_HYPERV is not set
# CONFIG_HYPERV_TSCPAGE is not set
# CONFIG_I2C_ALI1535 is not set
@@ -327,6 +331,7 @@ CONFIG_HWMON=m
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_LAPB is not set
# CONFIG_LDM_PARTITION is not set
+CONFIG_LIBNVDIMM=y
CONFIG_LOCALVERSION="-kvmsmall"
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_LXT_PHY is not set
@@ -391,7 +396,11 @@ CONFIG_LOCALVERSION="-kvmsmall"
# CONFIG_MTD is not set
# CONFIG_MWAVE is not set
# CONFIG_NATIONAL_PHY is not set
+CONFIG_ND_BLK=y
+CONFIG_ND_BTT=y
+CONFIG_ND_PFN=y
# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_NET_FAILOVER=y
# CONFIG_NET_NCSI is not set
# CONFIG_NET_NSH is not set
# CONFIG_NET_PKTGEN is not set
@@ -668,6 +677,7 @@ CONFIG_LOCALVERSION="-kvmsmall"
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_UFSHCD is not set
+CONFIG_SCSI_VIRTIO=y
# CONFIG_SCSI_WD719X is not set
# CONFIG_SENSORS_APDS990X is not set
# CONFIG_SENSORS_BH1770 is not set
@@ -792,11 +802,18 @@ CONFIG_LOCALVERSION="-kvmsmall"
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
# CONFIG_VIA_WDT is not set
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
# CONFIG_VITESSE_PHY is not set
# CONFIG_VMD is not set
# CONFIG_VMWARE_PVSCSI is not set
# CONFIG_VMWARE_VMCI is not set
-# CONFIG_VSOCKETS is not set
+CONFIG_VSOCKETS=y
# CONFIG_VXFS_FS is not set
# CONFIG_W1 is not set
# CONFIG_W83627HF_WDT is not set