From bca1576e6fd7ab313e48bedd58448822a245a424 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 29 Oct 2014 11:20:57 +0100 Subject: Update kernel source and configs to v3.17-rc2. This time with an overlayfs module, yay! Signed-off-by: aszlig --- machines/dnyarri-kconf.nix | 2 ++ machines/mmrnmhrm-kconf.nix | 2 ++ overrides/default.nix | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index 5dfd2b92..ac310c4b 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -848,6 +848,7 @@ "CONFIG_THERMAL_HWMON" = "y"; "CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE" = "y"; "CONFIG_THERMAL_GOV_STEP_WISE" = "y"; + "CONFIG_THERMAL_GOV_BANG_BANG" = "y"; "CONFIG_THERMAL_GOV_USER_SPACE" = "y"; "CONFIG_INTEL_POWERCLAMP" = "m"; "CONFIG_X86_PKG_TEMP_THERMAL" = "m"; @@ -1140,6 +1141,7 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; + "CONFIG_OVERLAYFS_FS" = "m"; "CONFIG_ISO9660_FS" = "y"; "CONFIG_JOLIET" = "y"; "CONFIG_UDF_FS" = "y"; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 6e032009..df9e7e19 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -600,6 +600,7 @@ "CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE" = "y"; "CONFIG_THERMAL_GOV_FAIR_SHARE" = "y"; "CONFIG_THERMAL_GOV_STEP_WISE" = "y"; + "CONFIG_THERMAL_GOV_BANG_BANG" = "y"; "CONFIG_THERMAL_GOV_USER_SPACE" = "y"; "CONFIG_INTEL_POWERCLAMP" = "m"; "CONFIG_X86_PKG_TEMP_THERMAL" = "m"; @@ -842,6 +843,7 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; + "CONFIG_OVERLAYFS_FS" = "m"; "CONFIG_FSCACHE" = "m"; "CONFIG_CACHEFILES" = "m"; "CONFIG_ISO9660_FS" = "y"; diff --git a/overrides/default.nix b/overrides/default.nix index b3f1cdae..1528dc1f 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -108,11 +108,11 @@ let # misc misc = { kernelSourceVuizvui = { - version = "3.18.0-rc1"; + version = "3.18.0-rc2"; src = everything.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; - rev = "c2661b806092d8ea2dccb7b02b65776555e0ee47"; - sha256 = "0xk5vrvjmby26q06ja0xsf1jgi4115hrsw3b5nqhgrx37jc89zp5"; + rev = "9f76628da20f96a179ca62b504886f99ecc29223"; + sha256 = "0r26friccy3dywrdm963cxkxjkgqwgr5r7j61zz8wc0md3n8ici3"; }; }; -- cgit 1.4.1