about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-01-11 19:50:41 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-01-11 19:50:41 +0100
commitb46da4afdb69f1d3185e6661d661ec399605e4b1 (patch)
treee9d32571811b53e4d2777c652e17d5263965c167
parentb4fee0793d5643c103cbf3da1de5bfb83ad9ef8b (diff)
Update kernel sources and configs to v3.19-rc3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--machines/dnyarri-kconf.nix20
-rw-r--r--machines/mmrnmhrm-kconf.nix12
-rw-r--r--overrides/default.nix6
3 files changed, 29 insertions, 9 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix
index cd516573..832f1a3c 100644
--- a/machines/dnyarri-kconf.nix
+++ b/machines/dnyarri-kconf.nix
@@ -64,6 +64,7 @@
   "CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ" = "y";
   "CONFIG_GENERIC_PENDING_IRQ" = "y";
   "CONFIG_IRQ_DOMAIN" = "y";
+  "CONFIG_GENERIC_MSI_IRQ" = "y";
   "CONFIG_IRQ_FORCED_THREADING" = "y";
   "CONFIG_SPARSE_IRQ" = "y";
   "CONFIG_CLOCKSOURCE_WATCHDOG" = "y";
@@ -87,13 +88,12 @@
   "CONFIG_TASK_DELAY_ACCT" = "y";
   "CONFIG_TASK_XACCT" = "y";
   "CONFIG_TASK_IO_ACCOUNTING" = "y";
-  "CONFIG_TREE_PREEMPT_RCU" = "y";
   "CONFIG_PREEMPT_RCU" = "y";
   "CONFIG_RCU_STALL_COMMON" = "y";
   "CONFIG_RCU_FANOUT" = "64";
   "CONFIG_RCU_FANOUT_LEAF" = "16";
   "CONFIG_RCU_BOOST" = "y";
-  "CONFIG_RCU_BOOST_PRIO" = "1";
+  "CONFIG_RCU_KTHREAD_PRIO" = "1";
   "CONFIG_RCU_BOOST_DELAY" = "500";
   "CONFIG_BUILD_BIN2C" = "y";
   "CONFIG_IKCONFIG" = "y";
@@ -201,6 +201,7 @@
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
+  "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
@@ -276,6 +277,7 @@
   "CONFIG_X86_THERMAL_VECTOR" = "y";
   "CONFIG_X86_16BIT" = "y";
   "CONFIG_X86_ESPFIX64" = "y";
+  "CONFIG_X86_VSYSCALL_EMULATION" = "y";
   "CONFIG_MICROCODE" = "y";
   "CONFIG_MICROCODE_INTEL" = "y";
   "CONFIG_MICROCODE_OLD_INTERFACE" = "y";
@@ -346,6 +348,7 @@
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
   "CONFIG_USE_PERCPU_NUMA_NODE_ID" = "y";
+  "CONFIG_PM" = "y";
   "CONFIG_ACPI" = "y";
   "CONFIG_ACPI_LEGACY_TABLES_LOOKUP" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC" = "y";
@@ -374,6 +377,7 @@
   "CONFIG_PCIEAER" = "y";
   "CONFIG_PCIEASPM" = "y";
   "CONFIG_PCIEASPM_PERFORMANCE" = "y";
+  "CONFIG_PCIE_PME" = "y";
   "CONFIG_PCI_MSI" = "y";
   "CONFIG_HT_IRQ" = "y";
   "CONFIG_PCI_LABEL" = "y";
@@ -465,6 +469,7 @@
   "CONFIG_NF_NAT_IRC" = "m";
   "CONFIG_NF_NAT_SIP" = "m";
   "CONFIG_NF_NAT_TFTP" = "m";
+  "CONFIG_NF_NAT_REDIRECT" = "m";
   "CONFIG_NETFILTER_SYNPROXY" = "m";
   "CONFIG_NF_TABLES" = "m";
   "CONFIG_NF_TABLES_INET" = "m";
@@ -477,6 +482,7 @@
   "CONFIG_NFT_LOG" = "m";
   "CONFIG_NFT_LIMIT" = "m";
   "CONFIG_NFT_MASQ" = "m";
+  "CONFIG_NFT_REDIR" = "m";
   "CONFIG_NFT_NAT" = "m";
   "CONFIG_NFT_QUEUE" = "m";
   "CONFIG_NFT_REJECT" = "m";
@@ -582,6 +588,7 @@
   "CONFIG_NFT_CHAIN_NAT_IPV4" = "m";
   "CONFIG_NF_NAT_MASQUERADE_IPV4" = "m";
   "CONFIG_NFT_MASQ_IPV4" = "m";
+  "CONFIG_NFT_REDIR_IPV4" = "m";
   "CONFIG_NF_NAT_SNMP_BASIC" = "m";
   "CONFIG_NF_NAT_PROTO_GRE" = "m";
   "CONFIG_NF_NAT_PPTP" = "m";
@@ -617,6 +624,7 @@
   "CONFIG_NFT_CHAIN_NAT_IPV6" = "m";
   "CONFIG_NF_NAT_MASQUERADE_IPV6" = "m";
   "CONFIG_NFT_MASQ_IPV6" = "m";
+  "CONFIG_NFT_REDIR_IPV6" = "m";
   "CONFIG_IP6_NF_IPTABLES" = "m";
   "CONFIG_IP6_NF_MATCH_AH" = "m";
   "CONFIG_IP6_NF_MATCH_EUI64" = "m";
@@ -702,16 +710,18 @@
   "CONFIG_NET_ACT_SIMP" = "m";
   "CONFIG_NET_ACT_SKBEDIT" = "m";
   "CONFIG_NET_ACT_CSUM" = "m";
+  "CONFIG_NET_ACT_VLAN" = "m";
   "CONFIG_NET_CLS_IND" = "y";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
   "CONFIG_BATMAN_ADV" = "m";
   "CONFIG_BATMAN_ADV_BLA" = "y";
   "CONFIG_OPENVSWITCH" = "m";
-  "CONFIG_OPENVSWITCH_VXLAN" = "y";
+  "CONFIG_OPENVSWITCH_VXLAN" = "m";
   "CONFIG_VSOCKETS" = "m";
   "CONFIG_NETLINK_MMAP" = "y";
   "CONFIG_NETLINK_DIAG" = "m";
+  "CONFIG_NET_MPLS_GSO" = "m";
   "CONFIG_HSR" = "m";
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
@@ -851,7 +861,6 @@
   "CONFIG_THERMAL_HWMON" = "y";
   "CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE" = "y";
   "CONFIG_THERMAL_GOV_STEP_WISE" = "y";
-  "CONFIG_THERMAL_GOV_BANG_BANG" = "y";
   "CONFIG_THERMAL_GOV_USER_SPACE" = "y";
   "CONFIG_INTEL_POWERCLAMP" = "m";
   "CONFIG_X86_PKG_TEMP_THERMAL" = "m";
@@ -983,6 +992,7 @@
   "CONFIG_SND_HDA_PATCH_LOADER" = "y";
   "CONFIG_SND_HDA_CODEC_REALTEK" = "y";
   "CONFIG_SND_HDA_GENERIC" = "y";
+  "CONFIG_SND_HDA_POWER_SAVE_DEFAULT" = "0";
   "CONFIG_SND_USB" = "y";
   "CONFIG_SND_USB_AUDIO" = "m";
   "CONFIG_HID" = "y";
@@ -1023,6 +1033,7 @@
   "CONFIG_USB_EHCI_PCI" = "y";
   "CONFIG_USB_STORAGE" = "y";
   "CONFIG_USB_STORAGE_REALTEK" = "m";
+  "CONFIG_REALTEK_AUTOPM" = "y";
   "CONFIG_USB_STORAGE_DATAFAB" = "m";
   "CONFIG_USB_STORAGE_FREECOM" = "m";
   "CONFIG_USB_STORAGE_ISD200" = "m";
@@ -1180,6 +1191,7 @@
   "CONFIG_SQUASHFS_FILE_CACHE" = "y";
   "CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU" = "y";
   "CONFIG_SQUASHFS_ZLIB" = "y";
+  "CONFIG_SQUASHFS_LZ4" = "y";
   "CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE" = "3";
   "CONFIG_VXFS_FS" = "m";
   "CONFIG_MINIX_FS" = "m";
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index d7753800..97055bab 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -64,6 +64,7 @@
   "CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ" = "y";
   "CONFIG_GENERIC_PENDING_IRQ" = "y";
   "CONFIG_IRQ_DOMAIN" = "y";
+  "CONFIG_GENERIC_MSI_IRQ" = "y";
   "CONFIG_IRQ_FORCED_THREADING" = "y";
   "CONFIG_SPARSE_IRQ" = "y";
   "CONFIG_CLOCKSOURCE_WATCHDOG" = "y";
@@ -86,13 +87,12 @@
   "CONFIG_TASK_DELAY_ACCT" = "y";
   "CONFIG_TASK_XACCT" = "y";
   "CONFIG_TASK_IO_ACCOUNTING" = "y";
-  "CONFIG_TREE_PREEMPT_RCU" = "y";
   "CONFIG_PREEMPT_RCU" = "y";
   "CONFIG_RCU_STALL_COMMON" = "y";
   "CONFIG_RCU_FANOUT" = "64";
   "CONFIG_RCU_FANOUT_LEAF" = "16";
   "CONFIG_RCU_BOOST" = "y";
-  "CONFIG_RCU_BOOST_PRIO" = "1";
+  "CONFIG_RCU_KTHREAD_PRIO" = "1";
   "CONFIG_RCU_BOOST_DELAY" = "500";
   "CONFIG_BUILD_BIN2C" = "y";
   "CONFIG_IKCONFIG" = "y";
@@ -200,6 +200,7 @@
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
+  "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
@@ -275,6 +276,7 @@
   "CONFIG_X86_THERMAL_VECTOR" = "y";
   "CONFIG_X86_16BIT" = "y";
   "CONFIG_X86_ESPFIX64" = "y";
+  "CONFIG_X86_VSYSCALL_EMULATION" = "y";
   "CONFIG_MICROCODE" = "y";
   "CONFIG_MICROCODE_INTEL" = "y";
   "CONFIG_MICROCODE_OLD_INTERFACE" = "y";
@@ -344,6 +346,7 @@
   "CONFIG_PHYSICAL_START" = "0x1000000";
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
+  "CONFIG_PM" = "y";
   "CONFIG_ACPI" = "y";
   "CONFIG_ACPI_LEGACY_TABLES_LOOKUP" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC" = "y";
@@ -372,6 +375,7 @@
   "CONFIG_PCIEAER" = "y";
   "CONFIG_PCIEASPM" = "y";
   "CONFIG_PCIEASPM_PERFORMANCE" = "y";
+  "CONFIG_PCIE_PME" = "y";
   "CONFIG_PCI_MSI" = "y";
   "CONFIG_HT_IRQ" = "y";
   "CONFIG_PCI_LABEL" = "y";
@@ -477,6 +481,7 @@
   "CONFIG_NET_ACT_SIMP" = "m";
   "CONFIG_NET_ACT_SKBEDIT" = "m";
   "CONFIG_NET_ACT_CSUM" = "m";
+  "CONFIG_NET_ACT_VLAN" = "m";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
   "CONFIG_VSOCKETS" = "y";
@@ -688,6 +693,7 @@
   "CONFIG_SND_HDA_INPUT_JACK" = "y";
   "CONFIG_SND_HDA_CODEC_SIGMATEL" = "y";
   "CONFIG_SND_HDA_GENERIC" = "y";
+  "CONFIG_SND_HDA_POWER_SAVE_DEFAULT" = "0";
   "CONFIG_SND_USB" = "y";
   "CONFIG_SND_USB_AUDIO" = "y";
   "CONFIG_HID" = "y";
@@ -726,6 +732,7 @@
   "CONFIG_USB_UHCI_HCD" = "y";
   "CONFIG_USB_STORAGE" = "y";
   "CONFIG_USB_STORAGE_REALTEK" = "m";
+  "CONFIG_REALTEK_AUTOPM" = "y";
   "CONFIG_USB_STORAGE_DATAFAB" = "m";
   "CONFIG_USB_STORAGE_FREECOM" = "m";
   "CONFIG_USB_STORAGE_ISD200" = "m";
@@ -877,6 +884,7 @@
   "CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU" = "y";
   "CONFIG_SQUASHFS_XATTR" = "y";
   "CONFIG_SQUASHFS_ZLIB" = "y";
+  "CONFIG_SQUASHFS_LZ4" = "y";
   "CONFIG_SQUASHFS_LZO" = "y";
   "CONFIG_SQUASHFS_XZ" = "y";
   "CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE" = "3";
diff --git a/overrides/default.nix b/overrides/default.nix
index 7b7da236..a5688508 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -95,11 +95,11 @@ let
   # misc
   misc = {
     kernelSourceVuizvui = {
-      version = "3.18.0";
+      version = "3.19.0-rc3";
       src = everything.fetchgit {
         url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-        rev = "b2776bf7149bddd1f4161f14f79520f17fc1d71d";
-        sha256 = "1w8rdm9i3m9xb8y1jfk8rd40ayh8ks85mr7wg90ma8ap99qj763m";
+        rev = "4850d37d3a7c049f7dc3eb09d7ae4e5553ac521b";
+        sha256 = "019k4wcyirfc286kzywzj0548mwq5y6gxs4512gjagpd1bzxscds";
       };
     };
   };