From 172e85e2c312e36572492beb108711ea9d7eee53 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 21 Oct 2014 00:21:06 +0200 Subject: Update kernel source and configs to v3.17-rc1. Yes, no in-between-merge-window this time, because I don't have a lot of time right now to handle when things are breaking big times. Signed-off-by: aszlig --- machines/mmrnmhrm-kconf.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'machines/mmrnmhrm-kconf.nix') diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 9b27bd96..6e032009 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -101,7 +101,6 @@ "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y"; "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y"; "CONFIG_ARCH_SUPPORTS_INT128" = "y"; - "CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE" = "y"; "CONFIG_CGROUPS" = "y"; "CONFIG_CGROUP_FREEZER" = "y"; "CONFIG_CGROUP_DEVICE" = "y"; @@ -148,6 +147,7 @@ "CONFIG_EVENTFD" = "y"; "CONFIG_SHMEM" = "y"; "CONFIG_AIO" = "y"; + "CONFIG_ADVISE_SYSCALLS" = "y"; "CONFIG_PCI_QUIRKS" = "y"; "CONFIG_HAVE_PERF_EVENTS" = "y"; "CONFIG_PERF_EVENTS" = "y"; @@ -234,6 +234,8 @@ "CONFIG_FREEZER" = "y"; "CONFIG_ZONE_DMA" = "y"; "CONFIG_SMP" = "y"; + "CONFIG_X86_FEATURE_NAMES" = "y"; + "CONFIG_IOSF_MBI" = "m"; "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y"; "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y"; "CONFIG_NO_BOOTMEM" = "y"; @@ -300,6 +302,7 @@ "CONFIG_PAGEFLAGS_EXTENDED" = "y"; "CONFIG_SPLIT_PTLOCK_CPUS" = "4"; "CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK" = "y"; + "CONFIG_MEMORY_BALLOON" = "y"; "CONFIG_BALLOON_COMPACTION" = "y"; "CONFIG_COMPACTION" = "y"; "CONFIG_MIGRATION" = "y"; @@ -385,7 +388,6 @@ "CONFIG_SYSVIPC_COMPAT" = "y"; "CONFIG_KEYS_COMPAT" = "y"; "CONFIG_X86_DEV_DMA_OPS" = "y"; - "CONFIG_IOSF_MBI" = "m"; "CONFIG_PMC_ATOM" = "y"; "CONFIG_NET" = "y"; "CONFIG_PACKET" = "y"; @@ -400,6 +402,8 @@ "CONFIG_IP_ROUTE_CLASSID" = "y"; "CONFIG_NET_IP_TUNNEL" = "m"; "CONFIG_NET_UDP_TUNNEL" = "m"; + "CONFIG_NET_FOU" = "m"; + "CONFIG_GENEVE" = "m"; "CONFIG_INET_TUNNEL" = "m"; "CONFIG_INET_LRO" = "y"; "CONFIG_INET_DIAG" = "y"; @@ -513,6 +517,7 @@ "CONFIG_SCSI_MOD" = "y"; "CONFIG_SCSI" = "y"; "CONFIG_SCSI_DMA" = "y"; + "CONFIG_SCSI_MQ_DEFAULT" = "y"; "CONFIG_BLK_DEV_SD" = "y"; "CONFIG_BLK_DEV_SR" = "y"; "CONFIG_CHR_DEV_SG" = "y"; @@ -627,6 +632,7 @@ "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y"; "CONFIG_DRM_BOCHS" = "m"; "CONFIG_FB" = "y"; + "CONFIG_FB_CMDLINE" = "y"; "CONFIG_FB_CFB_FILLRECT" = "y"; "CONFIG_FB_CFB_COPYAREA" = "y"; "CONFIG_FB_CFB_IMAGEBLIT" = "y"; @@ -783,7 +789,6 @@ "CONFIG_USB_SERIAL_OPTICON" = "m"; "CONFIG_USB_SERIAL_XSENS_MT" = "m"; "CONFIG_USB_SERIAL_WISHBONE" = "m"; - "CONFIG_USB_SERIAL_ZTE" = "m"; "CONFIG_USB_SERIAL_SSU100" = "m"; "CONFIG_USB_SERIAL_QT2" = "m"; "CONFIG_USB_EZUSB_FX2" = "m"; @@ -881,6 +886,7 @@ "CONFIG_NFSD_V3" = "y"; "CONFIG_NFSD_V3_ACL" = "y"; "CONFIG_NFSD_V4" = "y"; + "CONFIG_GRACE_PERIOD" = "y"; "CONFIG_LOCKD" = "y"; "CONFIG_LOCKD_V4" = "y"; "CONFIG_NFS_ACL_SUPPORT" = "y"; @@ -1009,6 +1015,7 @@ "CONFIG_CRYPTO_PCRYPT" = "y"; "CONFIG_CRYPTO_WORKQUEUE" = "y"; "CONFIG_CRYPTO_CRYPTD" = "y"; + "CONFIG_CRYPTO_MCRYPTD" = "m"; "CONFIG_CRYPTO_AUTHENC" = "m"; "CONFIG_CRYPTO_TEST" = "m"; "CONFIG_CRYPTO_ABLK_HELPER" = "y"; @@ -1045,6 +1052,7 @@ "CONFIG_CRYPTO_SHA1_SSSE3" = "m"; "CONFIG_CRYPTO_SHA256_SSSE3" = "m"; "CONFIG_CRYPTO_SHA512_SSSE3" = "m"; + "CONFIG_CRYPTO_SHA1_MB" = "m"; "CONFIG_CRYPTO_SHA256" = "y"; "CONFIG_CRYPTO_SHA512" = "y"; "CONFIG_CRYPTO_TGR192" = "m"; -- cgit 1.4.1