From bc7615eb4563d4f9ebf491cd77be034b70ef9376 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Jul 2014 21:24:34 -0700 Subject: [PATCH 1/2] coreos-kernel: bump to 3.15.6 --- ...{coreos-kernel-3.15.5.ebuild => coreos-kernel-3.15.6.ebuild} | 2 +- .../files/{x86_64_defconfig-3.15.5 => x86_64_defconfig-3.15.6} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.15.5.ebuild => coreos-kernel-3.15.6.ebuild} (86%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/{x86_64_defconfig-3.15.5 => x86_64_defconfig-3.15.6} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.6.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.6.ebuild index b1b7e2b4fc..bb0efd43fb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.15.6.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ EAPI=5 -CROS_WORKON_COMMIT="a484f1136a4a2e00b6a70567cf978f4ba52ba654" # v3.15.5 +CROS_WORKON_COMMIT="4250b32591fa333087dbecda0aa079cd88c5a640" # v3.15.6 CROS_WORKON_REPO="git://github.com" CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_LOCALNAME="linux" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.5 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.5 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 index 92977c1ec3..fc25c207d6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.5 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.5 Kernel Configuration +# Linux/x86 3.15.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y From cbb16693004c0ad498fa2e5c91a7efd2d3821e16 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Jul 2014 21:43:16 -0700 Subject: [PATCH 2/2] coreos-kernel: enable CONFIG_BLK_DEV_NVME This should resolve bug #82 --- .../sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 index fc25c207d6..7cb2fa5f0d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.15.6 @@ -1271,7 +1271,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=m # CONFIG_BLK_DEV_SKD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set