diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-05-01 23:29:54 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-05-01 23:29:54 +0200 |
| commit | db061c1acc7c67a41ddbc101c2e78b292fa3d139 (patch) | |
| tree | f44c903449319da8fca049a61fdee036bf4946ce | |
| parent | 5ba26b3e7f8c792ceb1cf01f1c46f3107d8b5660 (diff) | |
Update kernel and configs to v3.15-rc3.
This also enables POSIX ACL and extended attributes for tmpfs now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/dnyarri-kconf.nix | 6 | ||||
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 2 | ||||
| -rw-r--r-- | overrides/default.nix | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index a6b18992..7b8b43f3 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -209,8 +209,8 @@ "CONFIG_IOSCHED_NOOP" = "y"; "CONFIG_IOSCHED_DEADLINE" = "y"; "CONFIG_IOSCHED_CFQ" = "y"; - "CONFIG_IOSCHED_BFQ" = "y"; "CONFIG_CFQ_GROUP_IOSCHED" = "y"; + "CONFIG_IOSCHED_BFQ" = "y"; "CONFIG_CGROUP_BFQIO" = "y"; "CONFIG_DEFAULT_BFQ" = "y"; "CONFIG_DEFAULT_IOSCHED" = "bfq"; @@ -1076,6 +1076,7 @@ "CONFIG_JBD2" = "m"; "CONFIG_FS_MBCACHE" = "m"; "CONFIG_XFS_FS" = "y"; + "CONFIG_XFS_POSIX_ACL" = "y"; "CONFIG_FS_POSIX_ACL" = "y"; "CONFIG_EXPORTFS" = "y"; "CONFIG_FILE_LOCKING" = "y"; @@ -1102,6 +1103,8 @@ "CONFIG_KERNFS" = "y"; "CONFIG_SYSFS" = "y"; "CONFIG_TMPFS" = "y"; + "CONFIG_TMPFS_POSIX_ACL" = "y"; + "CONFIG_TMPFS_XATTR" = "y"; "CONFIG_CONFIGFS_FS" = "y"; "CONFIG_MISC_FILESYSTEMS" = "y"; "CONFIG_ADFS_FS" = "m"; @@ -1405,4 +1408,5 @@ "CONFIG_OID_REGISTRY" = "y"; "CONFIG_FONT_SUPPORT" = "y"; "CONFIG_FONT_8x8" = "y"; + "CONFIG_FONT_8x16" = "y"; } diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 4a8cf0f7..3e1a329c 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -210,8 +210,8 @@ "CONFIG_IOSCHED_NOOP" = "y"; "CONFIG_IOSCHED_DEADLINE" = "y"; "CONFIG_IOSCHED_CFQ" = "y"; - "CONFIG_IOSCHED_BFQ" = "y"; "CONFIG_CFQ_GROUP_IOSCHED" = "y"; + "CONFIG_IOSCHED_BFQ" = "y"; "CONFIG_CGROUP_BFQIO" = "y"; "CONFIG_DEFAULT_BFQ" = "y"; "CONFIG_DEFAULT_IOSCHED" = "bfq"; diff --git a/overrides/default.nix b/overrides/default.nix index 912e8fbb..309be7f0 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -90,11 +90,11 @@ let # misc misc = { kernelSourceAszlig = { - version = "3.15.0-rc2"; + version = "3.15.0-rc3"; src = everything.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; - rev = "c089b229dfdd09d59a11d8bc2344bf8196d575ce"; - sha256 = "061x6dravwllliwrcl0xyyvd4fg8x7lmx2fp20ckqqa9wl94543r"; + rev = "ba6728f596a60c4b161722c825883692a3606011"; + sha256 = "0yxv9hgr8140hlfv0ismdkg9jxa5rx42lx8padv1lh0w4iq7an2q"; }; }; |