about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/dnyarri-kconf.nix4
-rw-r--r--machines/mmrnmhrm-kconf.nix4
-rw-r--r--overrides/default.nix6
3 files changed, 11 insertions, 3 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix
index 84b0fc0b..091cc2c3 100644
--- a/machines/dnyarri-kconf.nix
+++ b/machines/dnyarri-kconf.nix
@@ -337,6 +337,7 @@
   "CONFIG_HZ" = "1000";
   "CONFIG_SCHED_HRTICK" = "y";
   "CONFIG_KEXEC" = "y";
+  "CONFIG_KEXEC_FILE" = "y";
   "CONFIG_PHYSICAL_START" = "0x1000000";
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
@@ -1014,6 +1015,9 @@
   "CONFIG_USB_STORAGE_CYPRESS_ATACB" = "m";
   "CONFIG_USB_STORAGE_ENE_UB6250" = "m";
   "CONFIG_USB_UAS" = "m";
+  "CONFIG_USBIP_CORE" = "m";
+  "CONFIG_USBIP_VHCI_HCD" = "m";
+  "CONFIG_USBIP_HOST" = "m";
   "CONFIG_USB_SERIAL" = "y";
   "CONFIG_USB_SERIAL_SIMPLE" = "m";
   "CONFIG_USB_SERIAL_AIRCABLE" = "m";
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 9d698a1f..d4419208 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -335,6 +335,7 @@
   "CONFIG_HZ" = "1000";
   "CONFIG_SCHED_HRTICK" = "y";
   "CONFIG_KEXEC" = "y";
+  "CONFIG_KEXEC_FILE" = "y";
   "CONFIG_PHYSICAL_START" = "0x1000000";
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
@@ -730,6 +731,9 @@
   "CONFIG_USB_UAS" = "m";
   "CONFIG_USB_MDC800" = "m";
   "CONFIG_USB_MICROTEK" = "m";
+  "CONFIG_USBIP_CORE" = "m";
+  "CONFIG_USBIP_VHCI_HCD" = "m";
+  "CONFIG_USBIP_HOST" = "m";
   "CONFIG_USB_SERIAL" = "m";
   "CONFIG_USB_SERIAL_GENERIC" = "y";
   "CONFIG_USB_SERIAL_SIMPLE" = "m";
diff --git a/overrides/default.nix b/overrides/default.nix
index e272fc93..3b78b58c 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -97,11 +97,11 @@ let
   # misc
   misc = {
     kernelSourceVuizvui = {
-      version = "3.17.0-rc1";
+      version = "3.17.0-rc3";
       src = everything.fetchgit {
         url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-        rev = "7be141d0554921751db103b54e9f794956aa4f65";
-        sha256 = "0civcpccg9ms5x44zcz4bxb294s2g9vq5fywywpam2ww74q05g9f";
+        rev = "7505ceaf863590b24a4c0c83b64817d26e0d51e3";
+        sha256 = "1q4mwrp26ng3kl9ll7m8nzl5ji6yn83h9629bvwxvhjjv887la6k";
       };
     };