Update kernel source and configs to pre-3.12.

This is within the current 3.12 merge window, so it still says 3.11,
even though it already contains the shiny new stuff like lockrefs and
more :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

3 files changed, 21 insertions, 25 deletions

diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix
index 96a722bf..f7412aae 100644
--- a/machines/dnyarri-kconf.nix
+++ b/machines/dnyarri-kconf.nix
@@ -320,7 +320,6 @@
   "CONFIG_ACPI_BUTTON" = "y";
   "CONFIG_ACPI_FAN" = "y";
   "CONFIG_ACPI_DOCK" = "y";
-  "CONFIG_ACPI_I2C" = "y";
   "CONFIG_ACPI_PROCESSOR" = "y";
   "CONFIG_ACPI_THERMAL" = "y";
   "CONFIG_ACPI_NUMA" = "y";
@@ -358,7 +357,6 @@
   "CONFIG_COMPAT_FOR_U64_ALIGNMENT" = "y";
   "CONFIG_SYSVIPC_COMPAT" = "y";
   "CONFIG_KEYS_COMPAT" = "y";
-  "CONFIG_HAVE_TEXT_POKE_SMP" = "y";
   "CONFIG_X86_DEV_DMA_OPS" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_PACKET" = "y";
@@ -372,6 +370,7 @@
   "CONFIG_IP_MULTICAST" = "y";
   "CONFIG_IP_ROUTE_CLASSID" = "y";
   "CONFIG_NET_IP_TUNNEL" = "m";
+  "CONFIG_SYN_COOKIES" = "y";
   "CONFIG_INET_TUNNEL" = "m";
   "CONFIG_INET_LRO" = "y";
   "CONFIG_INET_DIAG" = "y";
@@ -427,7 +426,7 @@
   "CONFIG_NF_NAT_IRC" = "m";
   "CONFIG_NF_NAT_SIP" = "m";
   "CONFIG_NF_NAT_TFTP" = "m";
-  "CONFIG_NETFILTER_TPROXY" = "m";
+  "CONFIG_NETFILTER_SYNPROXY" = "m";
   "CONFIG_NETFILTER_XTABLES" = "m";
   "CONFIG_NETFILTER_XT_MARK" = "m";
   "CONFIG_NETFILTER_XT_CONNMARK" = "m";
@@ -516,6 +515,7 @@
   "CONFIG_IP_NF_MATCH_TTL" = "m";
   "CONFIG_IP_NF_FILTER" = "m";
   "CONFIG_IP_NF_TARGET_REJECT" = "m";
+  "CONFIG_IP_NF_TARGET_SYNPROXY" = "m";
   "CONFIG_IP_NF_TARGET_ULOG" = "m";
   "CONFIG_NF_NAT_IPV4" = "m";
   "CONFIG_IP_NF_TARGET_MASQUERADE" = "m";
@@ -548,6 +548,7 @@
   "CONFIG_IP6_NF_TARGET_HL" = "m";
   "CONFIG_IP6_NF_FILTER" = "m";
   "CONFIG_IP6_NF_TARGET_REJECT" = "m";
+  "CONFIG_IP6_NF_TARGET_SYNPROXY" = "m";
   "CONFIG_IP6_NF_MANGLE" = "m";
   "CONFIG_IP6_NF_RAW" = "m";
   "CONFIG_NF_NAT_IPV6" = "m";
@@ -579,6 +580,7 @@
   "CONFIG_NET_SCH_QFQ" = "m";
   "CONFIG_NET_SCH_CODEL" = "m";
   "CONFIG_NET_SCH_FQ_CODEL" = "m";
+  "CONFIG_NET_SCH_FQ" = "m";
   "CONFIG_NET_SCH_INGRESS" = "m";
   "CONFIG_NET_SCH_PLUG" = "m";
   "CONFIG_NET_CLS" = "y";
@@ -617,6 +619,7 @@
   "CONFIG_BATMAN_ADV" = "m";
   "CONFIG_BATMAN_ADV_BLA" = "y";
   "CONFIG_OPENVSWITCH" = "m";
+  "CONFIG_OPENVSWITCH_VXLAN" = "y";
   "CONFIG_VSOCKETS" = "m";
   "CONFIG_NETLINK_MMAP" = "y";
   "CONFIG_NETLINK_DIAG" = "m";
@@ -720,6 +723,7 @@
   "CONFIG_CONSOLE_TRANSLATIONS" = "y";
   "CONFIG_VT_CONSOLE" = "y";
   "CONFIG_HW_CONSOLE" = "y";
+  "CONFIG_VT_HW_CONSOLE_BINDING" = "y";
   "CONFIG_UNIX98_PTYS" = "y";
   "CONFIG_DEVKMEM" = "y";
   "CONFIG_FIX_EARLYCON_MEM" = "y";
@@ -801,6 +805,7 @@
   "CONFIG_USB_GSPCA_SQ905C" = "m";
   "CONFIG_USB_GSPCA_SQ930X" = "m";
   "CONFIG_USB_GSPCA_STK014" = "m";
+  "CONFIG_USB_GSPCA_STK1135" = "m";
   "CONFIG_USB_GSPCA_STV0680" = "m";
   "CONFIG_USB_GSPCA_SUNPLUS" = "m";
   "CONFIG_USB_GSPCA_T613" = "m";
@@ -892,6 +897,7 @@
   "CONFIG_USB_HID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
+  "CONFIG_USB_OHCI_LITTLE_ENDIAN" = "y";
   "CONFIG_USB_SUPPORT" = "y";
   "CONFIG_USB_COMMON" = "y";
   "CONFIG_USB_ARCH_HAS_HCD" = "y";
@@ -917,6 +923,7 @@
   "CONFIG_USB_STORAGE_CYPRESS_ATACB" = "m";
   "CONFIG_USB_STORAGE_ENE_UB6250" = "m";
   "CONFIG_USB_SERIAL" = "y";
+  "CONFIG_USB_SERIAL_SIMPLE" = "m";
   "CONFIG_USB_SERIAL_AIRCABLE" = "m";
   "CONFIG_USB_SERIAL_ARK3116" = "m";
   "CONFIG_USB_SERIAL_BELKIN" = "m";
@@ -927,7 +934,6 @@
   "CONFIG_USB_SERIAL_CYPRESS_M8" = "m";
   "CONFIG_USB_SERIAL_EMPEG" = "m";
   "CONFIG_USB_SERIAL_FTDI_SIO" = "m";
-  "CONFIG_USB_SERIAL_FUNSOFT" = "m";
   "CONFIG_USB_SERIAL_VISOR" = "m";
   "CONFIG_USB_SERIAL_IPAQ" = "m";
   "CONFIG_USB_SERIAL_IR" = "m";
@@ -957,16 +963,13 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
-  "CONFIG_USB_SERIAL_MOTOROLA" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
   "CONFIG_USB_SERIAL_OTI6858" = "m";
   "CONFIG_USB_SERIAL_QCAUX" = "m";
   "CONFIG_USB_SERIAL_QUALCOMM" = "m";
   "CONFIG_USB_SERIAL_SPCP8X5" = "m";
-  "CONFIG_USB_SERIAL_HP4X" = "m";
   "CONFIG_USB_SERIAL_SAFE" = "m";
-  "CONFIG_USB_SERIAL_SIEMENS_MPI" = "m";
   "CONFIG_USB_SERIAL_SIERRAWIRELESS" = "m";
   "CONFIG_USB_SERIAL_SYMBOL" = "m";
   "CONFIG_USB_SERIAL_TI" = "m";
@@ -976,14 +979,11 @@
   "CONFIG_USB_SERIAL_OPTION" = "m";
   "CONFIG_USB_SERIAL_OMNINET" = "m";
   "CONFIG_USB_SERIAL_OPTICON" = "m";
-  "CONFIG_USB_SERIAL_VIVOPAY_SERIAL" = "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_FLASHLOADER" = "m";
-  "CONFIG_USB_SERIAL_SUUNTO" = "m";
   "CONFIG_USB_SERIAL_DEBUG" = "m";
   "CONFIG_USB_EZUSB_FX2" = "m";
   "CONFIG_RTC_LIB" = "y";
@@ -1273,6 +1273,8 @@
   "CONFIG_GENERIC_PCI_IOMAP" = "y";
   "CONFIG_GENERIC_IOMAP" = "y";
   "CONFIG_GENERIC_IO" = "y";
+  "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y";
+  "CONFIG_CMPXCHG_LOCKREF" = "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 7d2866dd..e8193589 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -325,7 +325,6 @@
   "CONFIG_ACPI_VIDEO" = "y";
   "CONFIG_ACPI_FAN" = "y";
   "CONFIG_ACPI_DOCK" = "y";
-  "CONFIG_ACPI_I2C" = "y";
   "CONFIG_ACPI_PROCESSOR" = "y";
   "CONFIG_ACPI_THERMAL" = "y";
   "CONFIG_ACPI_NUMA" = "y";
@@ -364,7 +363,6 @@
   "CONFIG_COMPAT_FOR_U64_ALIGNMENT" = "y";
   "CONFIG_SYSVIPC_COMPAT" = "y";
   "CONFIG_KEYS_COMPAT" = "y";
-  "CONFIG_HAVE_TEXT_POKE_SMP" = "y";
   "CONFIG_X86_DEV_DMA_OPS" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_PACKET" = "y";
@@ -414,6 +412,7 @@
   "CONFIG_NET_SCH_QFQ" = "m";
   "CONFIG_NET_SCH_CODEL" = "m";
   "CONFIG_NET_SCH_FQ_CODEL" = "m";
+  "CONFIG_NET_SCH_FQ" = "m";
   "CONFIG_NET_SCH_INGRESS" = "m";
   "CONFIG_NET_SCH_PLUG" = "m";
   "CONFIG_NET_CLS" = "y";
@@ -521,6 +520,7 @@
   "CONFIG_CONSOLE_TRANSLATIONS" = "y";
   "CONFIG_VT_CONSOLE" = "y";
   "CONFIG_HW_CONSOLE" = "y";
+  "CONFIG_VT_HW_CONSOLE_BINDING" = "y";
   "CONFIG_UNIX98_PTYS" = "y";
   "CONFIG_DEVKMEM" = "y";
   "CONFIG_FIX_EARLYCON_MEM" = "y";
@@ -575,8 +575,6 @@
   "CONFIG_DRM" = "y";
   "CONFIG_DRM_KMS_HELPER" = "y";
   "CONFIG_DRM_TTM" = "y";
-  "CONFIG_DRM_I2C_CH7006" = "m";
-  "CONFIG_DRM_I2C_SIL164" = "m";
   "CONFIG_DRM_NOUVEAU" = "y";
   "CONFIG_NOUVEAU_DEBUG" = "5";
   "CONFIG_NOUVEAU_DEBUG_DEFAULT" = "3";
@@ -653,6 +651,7 @@
   "CONFIG_USB_HID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
+  "CONFIG_USB_OHCI_LITTLE_ENDIAN" = "y";
   "CONFIG_USB_SUPPORT" = "y";
   "CONFIG_USB_COMMON" = "y";
   "CONFIG_USB_ARCH_HAS_HCD" = "y";
@@ -683,6 +682,7 @@
   "CONFIG_USB_MICROTEK" = "m";
   "CONFIG_USB_SERIAL" = "m";
   "CONFIG_USB_SERIAL_GENERIC" = "y";
+  "CONFIG_USB_SERIAL_SIMPLE" = "m";
   "CONFIG_USB_SERIAL_AIRCABLE" = "m";
   "CONFIG_USB_SERIAL_ARK3116" = "m";
   "CONFIG_USB_SERIAL_BELKIN" = "m";
@@ -693,7 +693,6 @@
   "CONFIG_USB_SERIAL_CYPRESS_M8" = "m";
   "CONFIG_USB_SERIAL_EMPEG" = "m";
   "CONFIG_USB_SERIAL_FTDI_SIO" = "m";
-  "CONFIG_USB_SERIAL_FUNSOFT" = "m";
   "CONFIG_USB_SERIAL_VISOR" = "m";
   "CONFIG_USB_SERIAL_IPAQ" = "m";
   "CONFIG_USB_SERIAL_IR" = "m";
@@ -711,16 +710,13 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
-  "CONFIG_USB_SERIAL_MOTOROLA" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
   "CONFIG_USB_SERIAL_OTI6858" = "m";
   "CONFIG_USB_SERIAL_QCAUX" = "m";
   "CONFIG_USB_SERIAL_QUALCOMM" = "m";
   "CONFIG_USB_SERIAL_SPCP8X5" = "m";
-  "CONFIG_USB_SERIAL_HP4X" = "m";
   "CONFIG_USB_SERIAL_SAFE" = "m";
-  "CONFIG_USB_SERIAL_SIEMENS_MPI" = "m";
   "CONFIG_USB_SERIAL_SIERRAWIRELESS" = "m";
   "CONFIG_USB_SERIAL_SYMBOL" = "m";
   "CONFIG_USB_SERIAL_TI" = "m";
@@ -730,15 +726,11 @@
   "CONFIG_USB_SERIAL_OPTION" = "m";
   "CONFIG_USB_SERIAL_OMNINET" = "m";
   "CONFIG_USB_SERIAL_OPTICON" = "m";
-  "CONFIG_USB_SERIAL_VIVOPAY_SERIAL" = "m";
   "CONFIG_USB_SERIAL_XSENS_MT" = "m";
-  "CONFIG_USB_SERIAL_ZIO" = "m";
   "CONFIG_USB_SERIAL_WISHBONE" = "m";
   "CONFIG_USB_SERIAL_ZTE" = "m";
   "CONFIG_USB_SERIAL_SSU100" = "m";
   "CONFIG_USB_SERIAL_QT2" = "m";
-  "CONFIG_USB_SERIAL_FLASHLOADER" = "m";
-  "CONFIG_USB_SERIAL_SUUNTO" = "m";
   "CONFIG_USB_EZUSB_FX2" = "m";
   "CONFIG_USB_GADGET" = "m";
   "CONFIG_USB_GADGET_VBUS_DRAW" = "2";
@@ -1090,6 +1082,8 @@
   "CONFIG_GENERIC_PCI_IOMAP" = "y";
   "CONFIG_GENERIC_IOMAP" = "y";
   "CONFIG_GENERIC_IO" = "y";
+  "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y";
+  "CONFIG_CMPXCHG_LOCKREF" = "y";
   "CONFIG_CRC_CCITT" = "y";
   "CONFIG_CRC16" = "y";
   "CONFIG_CRC_T10DIF" = "y";
diff --git a/overrides/default.nix b/overrides/default.nix
index d5aa52fc..8f8d2f9d 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -86,11 +86,11 @@ let
   # misc
   misc = {
     kernelSourceAszlig = {
-      version = "3.11.0-rc5";
+      version = "3.11.0";
       src = everything.fetchgit {
         url = /home/aszlig/linux;
-        rev = "28fbc8b6a29c849a3f03a6b05010d4b584055665";
-        sha256 = "17bp3z18k4sa3zvk465qd8njycarv5wc28k6mc8fp46am198zqsd";
+        rev = "2e032852245b3dcfe5461d7353e34eb6da095ccf";
+        sha256 = "0j7imbmw1zp28b6slmcvwgdiy5ddbj89wlyr8xchw5rr9dal5329";
       };
     };