diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-10-06 07:07:50 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-10-06 07:07:50 +0200 |
| commit | 72ae75470823b84c896d0ab523a7961ada762e5d (patch) | |
| tree | d50600613d1c9ae435036226df05be1c2f439897 | |
| parent | cc25dbe9e39ce13dffb534d7fcdb8a1bc13c35d0 (diff) | |
Update kernel source and configs to v3.17.0.
I'm not quite sure why dnyarri's kconf got so out of sync, but this includes the changes from "make oldconfig". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/dnyarri-kconf.nix | 16 | ||||
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 1 | ||||
| -rw-r--r-- | overrides/default.nix | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index e9ca7c0e..77326551 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -490,6 +490,7 @@ "CONFIG_NETFILTER_XT_TARGET_IDLETIMER" = "m"; "CONFIG_NETFILTER_XT_TARGET_LOG" = "m"; "CONFIG_NETFILTER_XT_TARGET_MARK" = "m"; + "CONFIG_NETFILTER_XT_NAT" = "m"; "CONFIG_NETFILTER_XT_TARGET_NETMAP" = "m"; "CONFIG_NETFILTER_XT_TARGET_NFLOG" = "m"; "CONFIG_NETFILTER_XT_TARGET_NFQUEUE" = "m"; @@ -570,6 +571,11 @@ "CONFIG_NFT_CHAIN_NAT_IPV4" = "m"; "CONFIG_NFT_REJECT_IPV4" = "m"; "CONFIG_NF_TABLES_ARP" = "m"; + "CONFIG_NF_NAT_IPV4" = "m"; + "CONFIG_NF_NAT_SNMP_BASIC" = "m"; + "CONFIG_NF_NAT_PROTO_GRE" = "m"; + "CONFIG_NF_NAT_PPTP" = "m"; + "CONFIG_NF_NAT_H323" = "m"; "CONFIG_IP_NF_IPTABLES" = "m"; "CONFIG_IP_NF_MATCH_AH" = "m"; "CONFIG_IP_NF_MATCH_ECN" = "m"; @@ -578,14 +584,10 @@ "CONFIG_IP_NF_FILTER" = "m"; "CONFIG_IP_NF_TARGET_REJECT" = "m"; "CONFIG_IP_NF_TARGET_SYNPROXY" = "m"; - "CONFIG_NF_NAT_IPV4" = "m"; + "CONFIG_IP_NF_NAT" = "m"; "CONFIG_IP_NF_TARGET_MASQUERADE" = "m"; "CONFIG_IP_NF_TARGET_NETMAP" = "m"; "CONFIG_IP_NF_TARGET_REDIRECT" = "m"; - "CONFIG_NF_NAT_SNMP_BASIC" = "m"; - "CONFIG_NF_NAT_PROTO_GRE" = "m"; - "CONFIG_NF_NAT_PPTP" = "m"; - "CONFIG_NF_NAT_H323" = "m"; "CONFIG_IP_NF_MANGLE" = "m"; "CONFIG_IP_NF_TARGET_CLUSTERIP" = "m"; "CONFIG_IP_NF_TARGET_ECN" = "m"; @@ -601,6 +603,7 @@ "CONFIG_NFT_CHAIN_NAT_IPV6" = "m"; "CONFIG_NFT_REJECT_IPV6" = "m"; "CONFIG_NF_LOG_IPV6" = "m"; + "CONFIG_NF_NAT_IPV6" = "m"; "CONFIG_IP6_NF_IPTABLES" = "m"; "CONFIG_IP6_NF_MATCH_AH" = "m"; "CONFIG_IP6_NF_MATCH_EUI64" = "m"; @@ -617,7 +620,7 @@ "CONFIG_IP6_NF_TARGET_SYNPROXY" = "m"; "CONFIG_IP6_NF_MANGLE" = "m"; "CONFIG_IP6_NF_RAW" = "m"; - "CONFIG_NF_NAT_IPV6" = "m"; + "CONFIG_IP6_NF_NAT" = "m"; "CONFIG_IP6_NF_TARGET_MASQUERADE" = "m"; "CONFIG_IP6_NF_TARGET_NPT" = "m"; "CONFIG_NF_TABLES_BRIDGE" = "m"; @@ -1392,6 +1395,7 @@ "CONFIG_GENERIC_IOMAP" = "y"; "CONFIG_GENERIC_IO" = "y"; "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y"; + "CONFIG_ARCH_HAS_FAST_MULTIPLIER" = "y"; "CONFIG_CRC_CCITT" = "y"; "CONFIG_CRC16" = "y"; "CONFIG_CRC_T10DIF" = "y"; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index d4419208..9b27bd96 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -1124,6 +1124,7 @@ "CONFIG_GENERIC_IOMAP" = "y"; "CONFIG_GENERIC_IO" = "y"; "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y"; + "CONFIG_ARCH_HAS_FAST_MULTIPLIER" = "y"; "CONFIG_CRC_CCITT" = "y"; "CONFIG_CRC16" = "y"; "CONFIG_CRC_T10DIF" = "y"; diff --git a/overrides/default.nix b/overrides/default.nix index d0f86d19..dc8019c0 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -97,11 +97,11 @@ let # misc misc = { kernelSourceVuizvui = { - version = "3.17.0-rc6"; + version = "3.17.0"; src = everything.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; - rev = "c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78"; - sha256 = "078qvqfxmmkjh1xjcwqn39xgvyagcjqwbd9f7ap5w9awys1f0vx8"; + rev = "bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9"; + sha256 = "14jy7s2zw35gcl7hcvlj5y6g848j05h32xz7ggzp1wv19cg62im0"; }; }; |