mmrnmhrm/dnyarri: Update kernel/config to 4.1-rc3.

It's about time I update these machines to the latest and greatest
kernel. Not much to say about the config as it's mostly catching up with
new options, although I'm still not happy to do configuration manually
without generalizing common options.

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

2 files changed, 34 insertions, 14 deletions

diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix
index 7e176541..a26bc293 100644
--- a/machines/aszlig/dnyarri-kconf.nix
+++ b/machines/aszlig/dnyarri-kconf.nix
@@ -37,6 +37,7 @@
   "CONFIG_ARCH_HWEIGHT_CFLAGS" = "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11";
   "CONFIG_ARCH_SUPPORTS_UPROBES" = "y";
   "CONFIG_FIX_EARLYCON_MEM" = "y";
+  "CONFIG_PGTABLE_LEVELS" = "4";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
   "CONFIG_IRQ_WORK" = "y";
   "CONFIG_BUILDTIME_EXTABLE_SORT" = "y";
@@ -72,7 +73,6 @@
   "CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE" = "y";
   "CONFIG_GENERIC_TIME_VSYSCALL" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS" = "y";
-  "CONFIG_GENERIC_CLOCKEVENTS_BUILD" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS_BROADCAST" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST" = "y";
   "CONFIG_GENERIC_CMOS_UPDATE" = "y";
@@ -136,6 +136,7 @@
   "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
   "CONFIG_BPF" = "y";
   "CONFIG_UID16" = "y";
+  "CONFIG_MULTIUSER" = "y";
   "CONFIG_SGETMASK_SYSCALL" = "y";
   "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
@@ -197,9 +198,11 @@
   "CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN" = "y";
   "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y";
   "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y";
+  "CONFIG_HAVE_ARCH_HUGE_VMAP" = "y";
   "CONFIG_HAVE_ARCH_SOFT_DIRTY" = "y";
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
+  "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
@@ -245,7 +248,6 @@
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
   "CONFIG_NO_BOOTMEM" = "y";
-  "CONFIG_MEMTEST" = "y";
   "CONFIG_MCORE2" = "y";
   "CONFIG_X86_INTERNODE_CACHE_SHIFT" = "6";
   "CONFIG_X86_L1_CACHE_SHIFT" = "6";
@@ -271,7 +273,6 @@
   "CONFIG_SCHED_MC" = "y";
   "CONFIG_PREEMPT" = "y";
   "CONFIG_PREEMPT_COUNT" = "y";
-  "CONFIG_X86_UP_APIC_MSI" = "y";
   "CONFIG_X86_LOCAL_APIC" = "y";
   "CONFIG_X86_IO_APIC" = "y";
   "CONFIG_X86_MCE" = "y";
@@ -290,7 +291,7 @@
   "CONFIG_X86_CPUID" = "m";
   "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y";
   "CONFIG_ARCH_DMA_ADDR_T_64BIT" = "y";
-  "CONFIG_DIRECT_GBPAGES" = "y";
+  "CONFIG_X86_DIRECT_GBPAGES" = "y";
   "CONFIG_NUMA" = "y";
   "CONFIG_X86_64_ACPI_NUMA" = "y";
   "CONFIG_NODES_SPAN_OTHER_NODES" = "y";
@@ -356,6 +357,7 @@
   "CONFIG_ACPI" = "y";
   "CONFIG_ACPI_LEGACY_TABLES_LOOKUP" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC" = "y";
+  "CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT" = "y";
   "CONFIG_ACPI_BUTTON" = "y";
   "CONFIG_ACPI_VIDEO" = "y";
   "CONFIG_ACPI_FAN" = "y";
@@ -390,7 +392,6 @@
   "CONFIG_AMD_NB" = "y";
   "CONFIG_BINFMT_ELF" = "y";
   "CONFIG_COMPAT_BINFMT_ELF" = "y";
-  "CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE" = "y";
   "CONFIG_BINFMT_SCRIPT" = "y";
   "CONFIG_BINFMT_MISC" = "y";
   "CONFIG_COREDUMP" = "y";
@@ -582,13 +583,13 @@
   "CONFIG_IP_SET_LIST_SET" = "m";
   "CONFIG_NF_DEFRAG_IPV4" = "m";
   "CONFIG_NF_CONNTRACK_IPV4" = "m";
-  "CONFIG_NF_LOG_ARP" = "m";
-  "CONFIG_NF_LOG_IPV4" = "m";
   "CONFIG_NF_TABLES_IPV4" = "m";
   "CONFIG_NFT_CHAIN_ROUTE_IPV4" = "m";
-  "CONFIG_NF_REJECT_IPV4" = "y";
   "CONFIG_NFT_REJECT_IPV4" = "m";
   "CONFIG_NF_TABLES_ARP" = "m";
+  "CONFIG_NF_LOG_ARP" = "m";
+  "CONFIG_NF_LOG_IPV4" = "m";
+  "CONFIG_NF_REJECT_IPV4" = "y";
   "CONFIG_NF_NAT_IPV4" = "m";
   "CONFIG_NFT_CHAIN_NAT_IPV4" = "m";
   "CONFIG_NF_NAT_MASQUERADE_IPV4" = "m";
@@ -622,8 +623,8 @@
   "CONFIG_NF_CONNTRACK_IPV6" = "m";
   "CONFIG_NF_TABLES_IPV6" = "m";
   "CONFIG_NFT_CHAIN_ROUTE_IPV6" = "m";
-  "CONFIG_NF_REJECT_IPV6" = "y";
   "CONFIG_NFT_REJECT_IPV6" = "m";
+  "CONFIG_NF_REJECT_IPV6" = "y";
   "CONFIG_NF_LOG_IPV6" = "m";
   "CONFIG_NF_NAT_IPV6" = "m";
   "CONFIG_NFT_CHAIN_NAT_IPV6" = "m";
@@ -728,7 +729,9 @@
   "CONFIG_VSOCKETS" = "m";
   "CONFIG_NETLINK_MMAP" = "y";
   "CONFIG_NETLINK_DIAG" = "m";
+  "CONFIG_MPLS" = "y";
   "CONFIG_NET_MPLS_GSO" = "m";
+  "CONFIG_MPLS_ROUTING" = "m";
   "CONFIG_HSR" = "m";
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
@@ -747,6 +750,7 @@
   "CONFIG_FIRMWARE_IN_KERNEL" = "y";
   "CONFIG_ALLOW_DEV_COREDUMP" = "y";
   "CONFIG_GENERIC_CPU_AUTOPROBE" = "y";
+  "CONFIG_REGMAP" = "y";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -760,6 +764,7 @@
   "CONFIG_BLK_DEV_LOOP" = "y";
   "CONFIG_BLK_DEV_LOOP_MIN_COUNT" = "0";
   "CONFIG_BLK_DEV_CRYPTOLOOP" = "m";
+  "CONFIG_BLK_DEV_PMEM" = "m";
   "CONFIG_CDROM_PKTCDVD" = "y";
   "CONFIG_CDROM_PKTCDVD_BUFFERS" = "8";
   "CONFIG_HAVE_IDE" = "y";
@@ -784,6 +789,7 @@
   "CONFIG_DM_UEVENT" = "y";
   "CONFIG_DM_FLAKEY" = "m";
   "CONFIG_DM_VERITY" = "m";
+  "CONFIG_DM_LOG_WRITES" = "m";
   "CONFIG_NETDEVICES" = "y";
   "CONFIG_NET_CORE" = "y";
   "CONFIG_DUMMY" = "m";
@@ -942,6 +948,7 @@
   "CONFIG_DRM_KMS_FB_HELPER" = "y";
   "CONFIG_DRM_TTM" = "y";
   "CONFIG_DRM_RADEON" = "y";
+  "CONFIG_DRM_RADEON_USERPTR" = "y";
   "CONFIG_DRM_BOCHS" = "m";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
@@ -1002,6 +1009,7 @@
   "CONFIG_SND_HDA_CODEC_REALTEK" = "y";
   "CONFIG_SND_HDA_GENERIC" = "y";
   "CONFIG_SND_HDA_POWER_SAVE_DEFAULT" = "0";
+  "CONFIG_SND_HDA_CORE" = "y";
   "CONFIG_SND_USB" = "y";
   "CONFIG_SND_USB_AUDIO" = "m";
   "CONFIG_HID" = "y";
@@ -1150,6 +1158,8 @@
   "CONFIG_EXT3_FS" = "m";
   "CONFIG_EXT4_FS" = "m";
   "CONFIG_EXT4_FS_POSIX_ACL" = "y";
+  "CONFIG_EXT4_ENCRYPTION" = "m";
+  "CONFIG_EXT4_FS_ENCRYPTION" = "y";
   "CONFIG_JBD" = "m";
   "CONFIG_JBD2" = "m";
   "CONFIG_FS_MBCACHE" = "m";
@@ -1286,6 +1296,7 @@
   "CONFIG_HAVE_C_RECORDMCOUNT" = "y";
   "CONFIG_TRACING_SUPPORT" = "y";
   "CONFIG_TEST_HEXDUMP" = "m";
+  "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
@@ -1411,6 +1422,7 @@
   "CONFIG_CRYPTO_USER_API_HASH" = "m";
   "CONFIG_CRYPTO_USER_API_SKCIPHER" = "m";
   "CONFIG_CRYPTO_USER_API_RNG" = "m";
+  "CONFIG_CRYPTO_USER_API_AEAD" = "m";
   "CONFIG_CRYPTO_HASH_INFO" = "y";
   "CONFIG_ASYMMETRIC_KEY_TYPE" = "y";
   "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "y";
diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix
index ac37de64..d6941d34 100644
--- a/machines/aszlig/mmrnmhrm-kconf.nix
+++ b/machines/aszlig/mmrnmhrm-kconf.nix
@@ -37,6 +37,7 @@
   "CONFIG_ARCH_HWEIGHT_CFLAGS" = "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11";
   "CONFIG_ARCH_SUPPORTS_UPROBES" = "y";
   "CONFIG_FIX_EARLYCON_MEM" = "y";
+  "CONFIG_PGTABLE_LEVELS" = "4";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
   "CONFIG_IRQ_WORK" = "y";
   "CONFIG_BUILDTIME_EXTABLE_SORT" = "y";
@@ -72,7 +73,6 @@
   "CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE" = "y";
   "CONFIG_GENERIC_TIME_VSYSCALL" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS" = "y";
-  "CONFIG_GENERIC_CLOCKEVENTS_BUILD" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS_BROADCAST" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST" = "y";
   "CONFIG_GENERIC_CMOS_UPDATE" = "y";
@@ -135,6 +135,7 @@
   "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
   "CONFIG_BPF" = "y";
   "CONFIG_UID16" = "y";
+  "CONFIG_MULTIUSER" = "y";
   "CONFIG_SGETMASK_SYSCALL" = "y";
   "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
@@ -196,9 +197,11 @@
   "CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN" = "y";
   "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y";
   "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y";
+  "CONFIG_HAVE_ARCH_HUGE_VMAP" = "y";
   "CONFIG_HAVE_ARCH_SOFT_DIRTY" = "y";
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
+  "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
@@ -244,7 +247,6 @@
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
   "CONFIG_NO_BOOTMEM" = "y";
-  "CONFIG_MEMTEST" = "y";
   "CONFIG_MCORE2" = "y";
   "CONFIG_X86_INTERNODE_CACHE_SHIFT" = "6";
   "CONFIG_X86_L1_CACHE_SHIFT" = "6";
@@ -270,7 +272,6 @@
   "CONFIG_SCHED_MC" = "y";
   "CONFIG_PREEMPT" = "y";
   "CONFIG_PREEMPT_COUNT" = "y";
-  "CONFIG_X86_UP_APIC_MSI" = "y";
   "CONFIG_X86_LOCAL_APIC" = "y";
   "CONFIG_X86_IO_APIC" = "y";
   "CONFIG_X86_MCE" = "y";
@@ -289,7 +290,7 @@
   "CONFIG_X86_CPUID" = "m";
   "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y";
   "CONFIG_ARCH_DMA_ADDR_T_64BIT" = "y";
-  "CONFIG_DIRECT_GBPAGES" = "y";
+  "CONFIG_X86_DIRECT_GBPAGES" = "y";
   "CONFIG_ARCH_SPARSEMEM_ENABLE" = "y";
   "CONFIG_ARCH_SPARSEMEM_DEFAULT" = "y";
   "CONFIG_ARCH_SELECT_MEMORY_MODEL" = "y";
@@ -354,6 +355,7 @@
   "CONFIG_ACPI" = "y";
   "CONFIG_ACPI_LEGACY_TABLES_LOOKUP" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC" = "y";
+  "CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT" = "y";
   "CONFIG_ACPI_BUTTON" = "y";
   "CONFIG_ACPI_VIDEO" = "y";
   "CONFIG_ACPI_FAN" = "y";
@@ -388,7 +390,6 @@
   "CONFIG_AMD_NB" = "y";
   "CONFIG_BINFMT_ELF" = "y";
   "CONFIG_COMPAT_BINFMT_ELF" = "y";
-  "CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE" = "y";
   "CONFIG_BINFMT_SCRIPT" = "y";
   "CONFIG_BINFMT_MISC" = "y";
   "CONFIG_COREDUMP" = "y";
@@ -509,6 +510,7 @@
   "CONFIG_FW_LOADER_USER_HELPER" = "y";
   "CONFIG_ALLOW_DEV_COREDUMP" = "y";
   "CONFIG_GENERIC_CPU_AUTOPROBE" = "y";
+  "CONFIG_REGMAP" = "y";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -546,6 +548,7 @@
   "CONFIG_BLK_DEV_DM" = "y";
   "CONFIG_DM_CRYPT" = "y";
   "CONFIG_DM_UEVENT" = "y";
+  "CONFIG_DM_LOG_WRITES" = "m";
   "CONFIG_NETDEVICES" = "y";
   "CONFIG_NET_CORE" = "y";
   "CONFIG_VXLAN" = "m";
@@ -703,6 +706,7 @@
   "CONFIG_SND_HDA_CODEC_SIGMATEL" = "y";
   "CONFIG_SND_HDA_GENERIC" = "y";
   "CONFIG_SND_HDA_POWER_SAVE_DEFAULT" = "0";
+  "CONFIG_SND_HDA_CORE" = "y";
   "CONFIG_SND_USB" = "y";
   "CONFIG_SND_USB_AUDIO" = "y";
   "CONFIG_HID" = "y";
@@ -723,6 +727,7 @@
   "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";
@@ -831,6 +836,7 @@
   "CONFIG_VIRTIO" = "m";
   "CONFIG_VIRTIO_PCI" = "m";
   "CONFIG_VIRTIO_BALLOON" = "m";
+  "CONFIG_VIRTIO_INPUT" = "m";
   "CONFIG_VIRTIO_MMIO" = "m";
   "CONFIG_X86_PLATFORM_DEVICES" = "y";
   "CONFIG_ACPI_WMI" = "y";
@@ -1001,6 +1007,7 @@
   "CONFIG_HAVE_C_RECORDMCOUNT" = "y";
   "CONFIG_TRACING_SUPPORT" = "y";
   "CONFIG_TEST_HEXDUMP" = "m";
+  "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
@@ -1127,6 +1134,7 @@
   "CONFIG_CRYPTO_USER_API_HASH" = "m";
   "CONFIG_CRYPTO_USER_API_SKCIPHER" = "m";
   "CONFIG_CRYPTO_USER_API_RNG" = "m";
+  "CONFIG_CRYPTO_USER_API_AEAD" = "m";
   "CONFIG_CRYPTO_HASH_INFO" = "y";
   "CONFIG_ASYMMETRIC_KEY_TYPE" = "m";
   "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "m";