summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--kernel/linux-4.1.18.config (renamed from kernel/linux-4.1.13.config)10
-rw-r--r--kernel/linux-4.1.18.defconfig (renamed from kernel/linux-4.1.13.defconfig)4
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 2676987..69d0df9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CRUXVERSION = 3.2
CUSTOMVERSION =
COLLECTIONS = core opt xorg
KERNEL_MIRROR = http://www.kernel.org
-KERNEL_VERSION = 4.1.13
+KERNEL_VERSION = 4.1.18
KERNEL_PATCHES =
BB_VERSION = 1.22.1
MEMTEST_VERSION = 5.01
diff --git a/kernel/linux-4.1.13.config b/kernel/linux-4.1.18.config
index 69a6e41..dfa4d58 100644
--- a/kernel/linux-4.1.13.config
+++ b/kernel/linux-4.1.18.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.13 Kernel Configuration
+# Linux/x86 4.1.18 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -787,7 +787,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_BLK_DEV_NVME=y
# CONFIG_BLK_DEV_SKD is not set
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_RAM is not set
@@ -796,7 +796,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_ATA_OVER_ETH is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
# CONFIG_XEN_BLKDEV_BACKEND is not set
-CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set
@@ -2454,12 +2454,12 @@ CONFIG_UIO=m
# CONFIG_UIO_MF624 is not set
# CONFIG_VFIO is not set
# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRTIO=m
+CONFIG_VIRTIO=y
#
# Virtio drivers
#
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_INPUT=m
diff --git a/kernel/linux-4.1.13.defconfig b/kernel/linux-4.1.18.defconfig
index 3ab77a9..ec6fc9e 100644
--- a/kernel/linux-4.1.13.defconfig
+++ b/kernel/linux-4.1.18.defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.13 Kernel Configuration
+# Linux/x86 4.1.18 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -787,7 +787,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_BLK_DEV_NVME=y
# CONFIG_BLK_DEV_SKD is not set
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_RAM is not set

Generated by cgit