diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-11-24 05:33:10 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-11-24 05:33:10 +0100 |
| commit | d11b194e90ff5764607f5720f85cebbff3ab24a9 (patch) | |
| tree | 7078976a7c3289374d3349889088850a302a2ae3 | |
| parent | 10e124d0d88e2e06acbfce035b887f9f03fe23aa (diff) | |
Update kernel sources and configs to v3.18-rc6.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/dnyarri-kconf.nix | 5 | ||||
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 5 | ||||
| -rw-r--r-- | overrides/default.nix | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index ac310c4b..cd516573 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -3,6 +3,7 @@ "CONFIG_X86_64" = "y"; "CONFIG_X86" = "y"; "CONFIG_INSTRUCTION_DECODER" = "y"; + "CONFIG_PERF_EVENTS_INTEL_UNCORE" = "y"; "CONFIG_OUTPUT_FORMAT" = "elf64-x86-64"; "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig"; "CONFIG_LOCKDEP_SUPPORT" = "y"; @@ -132,6 +133,7 @@ "CONFIG_HAVE_UID16" = "y"; "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y"; "CONFIG_HAVE_PCSPKR_PLATFORM" = "y"; + "CONFIG_BPF" = "y"; "CONFIG_UID16" = "y"; "CONFIG_SGETMASK_SYSCALL" = "y"; "CONFIG_SYSFS_SYSCALL" = "y"; @@ -728,6 +730,7 @@ "CONFIG_FIRMWARE_IN_KERNEL" = "y"; "CONFIG_EXTRA_FIRMWARE" = "@extra_firmware@"; "CONFIG_EXTRA_FIRMWARE_DIR" = "@builtin_firmware@"; + "CONFIG_ALLOW_DEV_COREDUMP" = "y"; "CONFIG_GENERIC_CPU_AUTOPROBE" = "y"; "CONFIG_DMA_SHARED_BUFFER" = "y"; "CONFIG_CONNECTOR" = "y"; @@ -1141,7 +1144,7 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; - "CONFIG_OVERLAYFS_FS" = "m"; + "CONFIG_OVERLAY_FS" = "y"; "CONFIG_ISO9660_FS" = "y"; "CONFIG_JOLIET" = "y"; "CONFIG_UDF_FS" = "y"; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index df9e7e19..d7753800 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -3,6 +3,7 @@ "CONFIG_X86_64" = "y"; "CONFIG_X86" = "y"; "CONFIG_INSTRUCTION_DECODER" = "y"; + "CONFIG_PERF_EVENTS_INTEL_UNCORE" = "y"; "CONFIG_OUTPUT_FORMAT" = "elf64-x86-64"; "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig"; "CONFIG_LOCKDEP_SUPPORT" = "y"; @@ -131,6 +132,7 @@ "CONFIG_HAVE_UID16" = "y"; "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y"; "CONFIG_HAVE_PCSPKR_PLATFORM" = "y"; + "CONFIG_BPF" = "y"; "CONFIG_UID16" = "y"; "CONFIG_SGETMASK_SYSCALL" = "y"; "CONFIG_SYSFS_SYSCALL" = "y"; @@ -494,6 +496,7 @@ "CONFIG_FW_LOADER" = "y"; "CONFIG_EXTRA_FIRMWARE" = ""; "CONFIG_FW_LOADER_USER_HELPER" = "y"; + "CONFIG_ALLOW_DEV_COREDUMP" = "y"; "CONFIG_GENERIC_CPU_AUTOPROBE" = "y"; "CONFIG_DMA_SHARED_BUFFER" = "y"; "CONFIG_CONNECTOR" = "y"; @@ -843,7 +846,7 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; - "CONFIG_OVERLAYFS_FS" = "m"; + "CONFIG_OVERLAY_FS" = "y"; "CONFIG_FSCACHE" = "m"; "CONFIG_CACHEFILES" = "m"; "CONFIG_ISO9660_FS" = "y"; diff --git a/overrides/default.nix b/overrides/default.nix index af3a5398..9b9007fd 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -95,11 +95,11 @@ let # misc misc = { kernelSourceVuizvui = { - version = "3.18.0-rc5"; + version = "3.18.0-rc6"; src = everything.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; - rev = "fc14f9c1272f62c3e8d01300f52467c0d9af50f9"; - sha256 = "1i2khdwnccblpc9xyphgijsj8m7wsplil6jnwh4zga9ssga43k24"; + rev = "5d01410fe4d92081f349b013a2e7a95429e4f2c9"; + sha256 = "16az5b8wnvgkj1fiw8fxrsfxghmgnfxzbfczdc20npdznj0d14j1"; }; }; }; |