about summary refs log tree commit diff
path: root/modules/user
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-04-01 19:22:01 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-04-01 19:22:01 +0200
commita67197b21270ae4297b3474d875994b80ee65d6c (patch)
tree74bb52beda0ad6fb92f4f21caa67e6bcf92f769b /modules/user
parenta854ad672eafce89ae300721dfb89cf170a803ba (diff)
mainlineKernel: Update to version 4.0.0-rc6.
They're just a few commits from 7fc377e..6c310bc and 24 changed files,
with 156 insertions and 93 deletions, so this really isn't necessary,
but I want to have that -rc6 instead of -rc5.

Actually, this isn't really -rc6 anyway, but -rc6 plus 9 more commits.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/aszlig/system/kernel.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index 6a008559..02e99282 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -18,11 +18,11 @@ let
   in pkgs.writeText "generated.kconf" (mkConf exprs + "\n");
 
   mainlineKernel = {
-    version = "4.0.0-rc5";
+    version = "4.0.0-rc6";
     src = pkgs.fetchgit {
       url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-      rev = "7fc377ecf452c02f3fd6aa0db9a3fd7d012ff500";
-      sha256 = "1cgwhhrqi4h2azf5cw6x7rizmzschzziq93wx8b5ld50sh4rwg4v";
+      rev = "6c310bc1acdd02110182a2ec6efa3e7571a3b80c";
+      sha256 = "1k28sqq8d8s3jicnskdwc180rag96am4xk9lbifajqv50adyjvnp";
     };
   };