mmrnmhrm/dnyarri: Update kernel src/cfg to 4.5-rc4

Geesh, the configuration is getting more and more rotten and it's time
to make this in a more generic configuration *very* soon.

The configuration does have a lot of cruft in it because it's a bunch of
"make oldconfig" iterations and no cleanup in-between.

In addition, even if I'd do the cleanup I'd probably want common options
to be factored out.

But for now let's keep the config as-is until 4.6 comes out and we
either play the "make oldconfig" game again or we finally rewrite it.

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

2 files changed, 72 insertions, 37 deletions

diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix
index a34f9871..614a7888 100644
--- a/machines/aszlig/dnyarri-kconf.nix
+++ b/machines/aszlig/dnyarri-kconf.nix
@@ -8,8 +8,11 @@
   "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig";
   "CONFIG_LOCKDEP_SUPPORT" = "y";
   "CONFIG_STACKTRACE_SUPPORT" = "y";
-  "CONFIG_HAVE_LATENCYTOP_SUPPORT" = "y";
   "CONFIG_MMU" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "28";
+  "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "32";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "8";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX" = "16";
   "CONFIG_NEED_DMA_MAP_STATE" = "y";
   "CONFIG_NEED_SG_DMA_LENGTH" = "y";
   "CONFIG_GENERIC_ISA_DMA" = "y";
@@ -101,15 +104,15 @@
   "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y";
   "CONFIG_ARCH_SUPPORTS_INT128" = "y";
   "CONFIG_CGROUPS" = "y";
-  "CONFIG_CGROUP_FREEZER" = "y";
-  "CONFIG_CGROUP_PIDS" = "y";
-  "CONFIG_CGROUP_DEVICE" = "y";
-  "CONFIG_CPUSETS" = "y";
-  "CONFIG_CGROUP_CPUACCT" = "y";
+  "CONFIG_BLK_CGROUP" = "y";
   "CONFIG_CGROUP_SCHED" = "y";
   "CONFIG_FAIR_GROUP_SCHED" = "y";
   "CONFIG_CFS_BANDWIDTH" = "y";
-  "CONFIG_BLK_CGROUP" = "y";
+  "CONFIG_CGROUP_PIDS" = "y";
+  "CONFIG_CGROUP_FREEZER" = "y";
+  "CONFIG_CPUSETS" = "y";
+  "CONFIG_CGROUP_DEVICE" = "y";
+  "CONFIG_CGROUP_CPUACCT" = "y";
   "CONFIG_NAMESPACES" = "y";
   "CONFIG_UTS_NS" = "y";
   "CONFIG_IPC_NS" = "y";
@@ -169,7 +172,6 @@
   "CONFIG_HAVE_OPTPROBES" = "y";
   "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
-  "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_HAVE_DMA_CONTIGUOUS" = "y";
   "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y";
   "CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT" = "y";
@@ -202,6 +204,10 @@
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
+  "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS" = "28";
+  "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
@@ -215,7 +221,6 @@
   "CONFIG_MODULE_FORCE_UNLOAD" = "y";
   "CONFIG_MODVERSIONS" = "y";
   "CONFIG_MODULES_TREE_LOOKUP" = "y";
-  "CONFIG_STOP_MACHINE" = "y";
   "CONFIG_BLOCK" = "y";
   "CONFIG_BLK_DEV_BSG" = "y";
   "CONFIG_BLK_DEV_INTEGRITY" = "y";
@@ -246,6 +251,7 @@
   "CONFIG_ZONE_DMA" = "y";
   "CONFIG_SMP" = "y";
   "CONFIG_X86_FEATURE_NAMES" = "y";
+  "CONFIG_X86_FAST_FEATURE_TESTS" = "y";
   "CONFIG_IOSF_MBI" = "m";
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
@@ -412,6 +418,7 @@
   "CONFIG_PMC_ATOM" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_NET_INGRESS" = "y";
+  "CONFIG_NET_EGRESS" = "y";
   "CONFIG_PACKET" = "y";
   "CONFIG_PACKET_DIAG" = "m";
   "CONFIG_UNIX" = "y";
@@ -504,6 +511,9 @@
   "CONFIG_NFT_REJECT" = "m";
   "CONFIG_NFT_REJECT_INET" = "m";
   "CONFIG_NFT_COMPAT" = "m";
+  "CONFIG_NF_DUP_NETDEV" = "m";
+  "CONFIG_NFT_DUP_NETDEV" = "m";
+  "CONFIG_NFT_FWD_NETDEV" = "m";
   "CONFIG_NETFILTER_XTABLES" = "m";
   "CONFIG_NETFILTER_XT_MARK" = "m";
   "CONFIG_NETFILTER_XT_CONNMARK" = "m";
@@ -752,6 +762,7 @@
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
+  "CONFIG_SOCK_CGROUP_DATA" = "y";
   "CONFIG_CGROUP_NET_CLASSID" = "y";
   "CONFIG_NET_RX_BUSY_POLL" = "y";
   "CONFIG_BQL" = "y";
@@ -805,6 +816,7 @@
   "CONFIG_DM_UEVENT" = "y";
   "CONFIG_DM_FLAKEY" = "m";
   "CONFIG_DM_VERITY" = "m";
+  "CONFIG_DM_VERITY_FEC" = "y";
   "CONFIG_DM_LOG_WRITES" = "m";
   "CONFIG_NETDEVICES" = "y";
   "CONFIG_NET_CORE" = "y";
@@ -849,6 +861,10 @@
   "CONFIG_INPUT_KEYBOARD" = "y";
   "CONFIG_KEYBOARD_ATKBD" = "y";
   "CONFIG_INPUT_MOUSE" = "y";
+  "CONFIG_INPUT_JOYSTICK" = "y";
+  "CONFIG_JOYSTICK_XPAD" = "y";
+  "CONFIG_JOYSTICK_XPAD_FF" = "y";
+  "CONFIG_JOYSTICK_XPAD_LEDS" = "y";
   "CONFIG_INPUT_MISC" = "y";
   "CONFIG_INPUT_UINPUT" = "m";
   "CONFIG_SERIO" = "y";
@@ -900,6 +916,7 @@
   "CONFIG_INTEL_PCH_THERMAL" = "m";
   "CONFIG_SSB_POSSIBLE" = "y";
   "CONFIG_BCMA_POSSIBLE" = "y";
+  "CONFIG_MFD_CORE" = "m";
   "CONFIG_MEDIA_SUPPORT" = "y";
   "CONFIG_MEDIA_CAMERA_SUPPORT" = "y";
   "CONFIG_VIDEO_DEV" = "y";
@@ -975,6 +992,7 @@
   "CONFIG_DRM_BRIDGE" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
+  "CONFIG_FB_NOTIFY" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
   "CONFIG_FB_CFB_IMAGEBLIT" = "y";
@@ -1040,18 +1058,7 @@
   "CONFIG_HID_BATTERY_STRENGTH" = "y";
   "CONFIG_UHID" = "m";
   "CONFIG_HID_GENERIC" = "y";
-  "CONFIG_HID_A4TECH" = "y";
-  "CONFIG_HID_APPLE" = "y";
-  "CONFIG_HID_BELKIN" = "y";
-  "CONFIG_HID_CHERRY" = "y";
-  "CONFIG_HID_CHICONY" = "y";
-  "CONFIG_HID_CYPRESS" = "y";
-  "CONFIG_HID_EZKEY" = "y";
-  "CONFIG_HID_GEMBIRD" = "m";
-  "CONFIG_HID_KENSINGTON" = "y";
-  "CONFIG_HID_LOGITECH" = "y";
   "CONFIG_HID_MICROSOFT" = "y";
-  "CONFIG_HID_MONTEREY" = "y";
   "CONFIG_HID_PANTHERLORD" = "y";
   "CONFIG_PANTHERLORD_FF" = "y";
   "CONFIG_HID_SONY" = "m";
@@ -1059,7 +1066,10 @@
   "CONFIG_HID_GREENASIA" = "y";
   "CONFIG_GREENASIA_FF" = "y";
   "CONFIG_HID_WACOM" = "m";
+  "CONFIG_HID_SENSOR_HUB" = "m";
+  "CONFIG_HID_SENSOR_CUSTOM_SENSOR" = "m";
   "CONFIG_USB_HID" = "y";
+  "CONFIG_HID_PID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
   "CONFIG_USB_OHCI_LITTLE_ENDIAN" = "y";
@@ -1133,6 +1143,7 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
+  "CONFIG_USB_SERIAL_MXUPORT11" = "m";
   "CONFIG_USB_SERIAL_MXUPORT" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
@@ -1157,8 +1168,9 @@
   "CONFIG_USB_SERIAL_DEBUG" = "m";
   "CONFIG_USB_EZUSB_FX2" = "m";
   "CONFIG_NEW_LEDS" = "y";
-  "CONFIG_LEDS_CLASS" = "m";
-  "CONFIG_LEDS_CLASS_FLASH" = "m";
+  "CONFIG_LEDS_CLASS" = "y";
+  "CONFIG_LEDS_CLASS_FLASH" = "y";
+  "CONFIG_LEDS_TRIGGERS" = "y";
   "CONFIG_EDAC_ATOMIC_SCRUB" = "y";
   "CONFIG_EDAC_SUPPORT" = "y";
   "CONFIG_RTC_LIB" = "y";
@@ -1175,7 +1187,7 @@
   "CONFIG_CLKEVT_I8253" = "y";
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
-  "CONFIG_EXTCON" = "m";
+  "CONFIG_ARM_GIC_MAX_NR" = "1";
   "CONFIG_RAS" = "y";
   "CONFIG_FIRMWARE_MEMMAP" = "y";
   "CONFIG_DMIID" = "y";
@@ -1331,7 +1343,10 @@
   "CONFIG_TEST_HEXDUMP" = "m";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
+  "CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL" = "y";
+  "CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
+  "CONFIG_IO_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
   "CONFIG_EARLY_PRINTK" = "y";
   "CONFIG_DOUBLEFAULT" = "y";
@@ -1566,6 +1581,7 @@
   "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y";
   "CONFIG_CLZ_TAB" = "y";
   "CONFIG_CORDIC" = "y";
+  "CONFIG_IRQ_POLL" = "y";
   "CONFIG_MPILIB" = "y";
   "CONFIG_OID_REGISTRY" = "y";
   "CONFIG_FONT_SUPPORT" = "y";
diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix
index 17c5cc7e..539f0346 100644
--- a/machines/aszlig/mmrnmhrm-kconf.nix
+++ b/machines/aszlig/mmrnmhrm-kconf.nix
@@ -8,8 +8,11 @@
   "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig";
   "CONFIG_LOCKDEP_SUPPORT" = "y";
   "CONFIG_STACKTRACE_SUPPORT" = "y";
-  "CONFIG_HAVE_LATENCYTOP_SUPPORT" = "y";
   "CONFIG_MMU" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "28";
+  "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "32";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "8";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX" = "16";
   "CONFIG_NEED_DMA_MAP_STATE" = "y";
   "CONFIG_NEED_SG_DMA_LENGTH" = "y";
   "CONFIG_GENERIC_ISA_DMA" = "y";
@@ -100,22 +103,21 @@
   "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y";
   "CONFIG_ARCH_SUPPORTS_INT128" = "y";
   "CONFIG_CGROUPS" = "y";
-  "CONFIG_CGROUP_FREEZER" = "y";
-  "CONFIG_CGROUP_PIDS" = "y";
-  "CONFIG_CGROUP_DEVICE" = "y";
-  "CONFIG_CPUSETS" = "y";
-  "CONFIG_CGROUP_CPUACCT" = "y";
   "CONFIG_PAGE_COUNTER" = "y";
   "CONFIG_MEMCG" = "y";
   "CONFIG_MEMCG_SWAP" = "y";
   "CONFIG_MEMCG_SWAP_ENABLED" = "y";
-  "CONFIG_MEMCG_KMEM" = "y";
-  "CONFIG_CGROUP_PERF" = "y";
+  "CONFIG_BLK_CGROUP" = "y";
+  "CONFIG_CGROUP_WRITEBACK" = "y";
   "CONFIG_CGROUP_SCHED" = "y";
   "CONFIG_FAIR_GROUP_SCHED" = "y";
   "CONFIG_CFS_BANDWIDTH" = "y";
-  "CONFIG_BLK_CGROUP" = "y";
-  "CONFIG_CGROUP_WRITEBACK" = "y";
+  "CONFIG_CGROUP_PIDS" = "y";
+  "CONFIG_CGROUP_FREEZER" = "y";
+  "CONFIG_CPUSETS" = "y";
+  "CONFIG_CGROUP_DEVICE" = "y";
+  "CONFIG_CGROUP_CPUACCT" = "y";
+  "CONFIG_CGROUP_PERF" = "y";
   "CONFIG_NAMESPACES" = "y";
   "CONFIG_UTS_NS" = "y";
   "CONFIG_IPC_NS" = "y";
@@ -175,7 +177,6 @@
   "CONFIG_HAVE_OPTPROBES" = "y";
   "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
-  "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_HAVE_DMA_CONTIGUOUS" = "y";
   "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y";
   "CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT" = "y";
@@ -208,6 +209,10 @@
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
+  "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS" = "28";
+  "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
@@ -221,7 +226,6 @@
   "CONFIG_MODULE_FORCE_UNLOAD" = "y";
   "CONFIG_MODVERSIONS" = "y";
   "CONFIG_MODULES_TREE_LOOKUP" = "y";
-  "CONFIG_STOP_MACHINE" = "y";
   "CONFIG_BLOCK" = "y";
   "CONFIG_BLK_DEV_BSG" = "y";
   "CONFIG_BLK_DEV_INTEGRITY" = "y";
@@ -252,6 +256,7 @@
   "CONFIG_ZONE_DMA" = "y";
   "CONFIG_SMP" = "y";
   "CONFIG_X86_FEATURE_NAMES" = "y";
+  "CONFIG_X86_FAST_FEATURE_TESTS" = "y";
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
   "CONFIG_NO_BOOTMEM" = "y";
@@ -416,6 +421,7 @@
   "CONFIG_PMC_ATOM" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_NET_INGRESS" = "y";
+  "CONFIG_NET_EGRESS" = "y";
   "CONFIG_PACKET" = "y";
   "CONFIG_PACKET_DIAG" = "m";
   "CONFIG_UNIX" = "y";
@@ -438,7 +444,6 @@
   "CONFIG_DEFAULT_TCP_CONG" = "cubic";
   "CONFIG_IPV6" = "y";
   "CONFIG_IPV6_ROUTER_PREF" = "y";
-  "CONFIG_IPV6_ILA" = "m";
   "CONFIG_INET6_TUNNEL" = "m";
   "CONFIG_IPV6_SIT" = "m";
   "CONFIG_IPV6_NDISC_NODETYPE" = "y";
@@ -512,6 +517,7 @@
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
+  "CONFIG_SOCK_CGROUP_DATA" = "y";
   "CONFIG_CGROUP_NET_CLASSID" = "y";
   "CONFIG_NET_RX_BUSY_POLL" = "y";
   "CONFIG_BQL" = "y";
@@ -589,8 +595,11 @@
   "CONFIG_INPUT_JOYDEV" = "y";
   "CONFIG_INPUT_EVDEV" = "y";
   "CONFIG_INPUT_KEYBOARD" = "y";
-  "CONFIG_KEYBOARD_ATKBD" = "y";
   "CONFIG_INPUT_MOUSE" = "y";
+  "CONFIG_INPUT_JOYSTICK" = "y";
+  "CONFIG_JOYSTICK_XPAD" = "y";
+  "CONFIG_JOYSTICK_XPAD_FF" = "y";
+  "CONFIG_JOYSTICK_XPAD_LEDS" = "y";
   "CONFIG_INPUT_TABLET" = "y";
   "CONFIG_SERIO" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_PC_SERIO" = "y";
@@ -675,6 +684,7 @@
   "CONFIG_DRM_BRIDGE" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
+  "CONFIG_FB_NOTIFY" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
   "CONFIG_FB_CFB_IMAGEBLIT" = "y";
@@ -737,8 +747,11 @@
   "CONFIG_HIDRAW" = "y";
   "CONFIG_UHID" = "m";
   "CONFIG_HID_GENERIC" = "y";
+  "CONFIG_HID_MICROSOFT" = "m";
   "CONFIG_HID_GREENASIA" = "y";
   "CONFIG_GREENASIA_FF" = "y";
+  "CONFIG_HID_SENSOR_HUB" = "m";
+  "CONFIG_HID_SENSOR_CUSTOM_SENSOR" = "m";
   "CONFIG_USB_HID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
@@ -806,6 +819,7 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
+  "CONFIG_USB_SERIAL_MXUPORT11" = "m";
   "CONFIG_USB_SERIAL_MXUPORT" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
@@ -860,6 +874,7 @@
   "CONFIG_CLKEVT_I8253" = "y";
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
+  "CONFIG_ARM_GIC_MAX_NR" = "1";
   "CONFIG_RAS" = "y";
   "CONFIG_LIBNVDIMM" = "m";
   "CONFIG_ND_BLK" = "m";
@@ -1029,7 +1044,10 @@
   "CONFIG_TEST_HEXDUMP" = "m";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
+  "CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL" = "y";
+  "CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
+  "CONFIG_IO_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
   "CONFIG_EARLY_PRINTK" = "y";
   "CONFIG_DOUBLEFAULT" = "y";
@@ -1261,6 +1279,7 @@
   "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y";
   "CONFIG_CLZ_TAB" = "y";
   "CONFIG_CORDIC" = "y";
+  "CONFIG_IRQ_POLL" = "y";
   "CONFIG_MPILIB" = "m";
   "CONFIG_OID_REGISTRY" = "y";
   "CONFIG_FONT_SUPPORT" = "y";