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/dnyarri-kconf.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'machines/dnyarri-kconf.nix') diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index 77326551..5dfd2b92 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -102,7 +102,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"; @@ -149,6 +148,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"; @@ -235,6 +235,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"; @@ -388,7 +390,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"; @@ -404,6 +405,8 @@ "CONFIG_NET_IP_TUNNEL" = "m"; "CONFIG_SYN_COOKIES" = "y"; "CONFIG_NET_UDP_TUNNEL" = "m"; + "CONFIG_NET_FOU" = "m"; + "CONFIG_GENEVE" = "m"; "CONFIG_INET_TUNNEL" = "m"; "CONFIG_INET_LRO" = "y"; "CONFIG_INET_DIAG" = "y"; @@ -421,7 +424,7 @@ "CONFIG_NET_PTP_CLASSIFY" = "y"; "CONFIG_NETFILTER" = "y"; "CONFIG_NETFILTER_ADVANCED" = "y"; - "CONFIG_BRIDGE_NETFILTER" = "y"; + "CONFIG_BRIDGE_NETFILTER" = "m"; "CONFIG_NETFILTER_NETLINK" = "m"; "CONFIG_NETFILTER_NETLINK_ACCT" = "m"; "CONFIG_NETFILTER_NETLINK_QUEUE" = "m"; @@ -471,6 +474,7 @@ "CONFIG_NFT_COUNTER" = "m"; "CONFIG_NFT_LOG" = "m"; "CONFIG_NFT_LIMIT" = "m"; + "CONFIG_NFT_MASQ" = "m"; "CONFIG_NFT_NAT" = "m"; "CONFIG_NFT_QUEUE" = "m"; "CONFIG_NFT_REJECT" = "m"; @@ -556,6 +560,7 @@ "CONFIG_IP_SET_HASH_IPPORT" = "m"; "CONFIG_IP_SET_HASH_IPPORTIP" = "m"; "CONFIG_IP_SET_HASH_IPPORTNET" = "m"; + "CONFIG_IP_SET_HASH_MAC" = "m"; "CONFIG_IP_SET_HASH_NETPORTNET" = "m"; "CONFIG_IP_SET_HASH_NET" = "m"; "CONFIG_IP_SET_HASH_NETNET" = "m"; @@ -568,10 +573,13 @@ "CONFIG_NF_LOG_IPV4" = "m"; "CONFIG_NF_TABLES_IPV4" = "m"; "CONFIG_NFT_CHAIN_ROUTE_IPV4" = "m"; - "CONFIG_NFT_CHAIN_NAT_IPV4" = "m"; + "CONFIG_NF_REJECT_IPV4" = "y"; "CONFIG_NFT_REJECT_IPV4" = "m"; "CONFIG_NF_TABLES_ARP" = "m"; "CONFIG_NF_NAT_IPV4" = "m"; + "CONFIG_NFT_CHAIN_NAT_IPV4" = "m"; + "CONFIG_NF_NAT_MASQUERADE_IPV4" = "m"; + "CONFIG_NFT_MASQ_IPV4" = "m"; "CONFIG_NF_NAT_SNMP_BASIC" = "m"; "CONFIG_NF_NAT_PROTO_GRE" = "m"; "CONFIG_NF_NAT_PPTP" = "m"; @@ -600,10 +608,13 @@ "CONFIG_NF_CONNTRACK_IPV6" = "m"; "CONFIG_NF_TABLES_IPV6" = "m"; "CONFIG_NFT_CHAIN_ROUTE_IPV6" = "m"; - "CONFIG_NFT_CHAIN_NAT_IPV6" = "m"; + "CONFIG_NF_REJECT_IPV6" = "y"; "CONFIG_NFT_REJECT_IPV6" = "m"; "CONFIG_NF_LOG_IPV6" = "m"; "CONFIG_NF_NAT_IPV6" = "m"; + "CONFIG_NFT_CHAIN_NAT_IPV6" = "m"; + "CONFIG_NF_NAT_MASQUERADE_IPV6" = "m"; + "CONFIG_NFT_MASQ_IPV6" = "m"; "CONFIG_IP6_NF_IPTABLES" = "m"; "CONFIG_IP6_NF_MATCH_AH" = "m"; "CONFIG_IP6_NF_MATCH_EUI64" = "m"; @@ -737,6 +748,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"; @@ -912,6 +924,7 @@ "CONFIG_DRM_RADEON" = "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"; @@ -1082,7 +1095,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_SERIAL_DEBUG" = "m"; @@ -1188,6 +1200,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"; @@ -1281,6 +1294,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"; @@ -1317,6 +1331,7 @@ "CONFIG_CRYPTO_SHA1_SSSE3" = "y"; "CONFIG_CRYPTO_SHA256_SSSE3" = "y"; "CONFIG_CRYPTO_SHA512_SSSE3" = "y"; + "CONFIG_CRYPTO_SHA1_MB" = "m"; "CONFIG_CRYPTO_SHA256" = "y"; "CONFIG_CRYPTO_SHA512" = "y"; "CONFIG_CRYPTO_TGR192" = "m"; -- cgit 1.4.1