Merge pull request #752 from gregkh/kernel_update

Kernel update to 3.15.6 and enable NVME driver
This commit is contained in:
Greg Kroah-Hartman 2014-07-19 12:59:41 -07:00
commit 516d7db8cb
2 changed files with 3 additions and 3 deletions

View File

@ -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 $ # $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 EAPI=5
CROS_WORKON_COMMIT="a484f1136a4a2e00b6a70567cf978f4ba52ba654" # v3.15.5 CROS_WORKON_COMMIT="4250b32591fa333087dbecda0aa079cd88c5a640" # v3.15.6
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_PROJECT="coreos/linux"
CROS_WORKON_LOCALNAME="linux" CROS_WORKON_LOCALNAME="linux"

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 3.15.5 Kernel Configuration # Linux/x86 3.15.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1271,7 +1271,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD 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_SKD is not set
# CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set