Merge remote-tracking branch 'origin/master'

2 files changed, 48 insertions, 14 deletions

diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix
index 614a7888..a9b887bb 100644
--- a/machines/aszlig/dnyarri-kconf.nix
+++ b/machines/aszlig/dnyarri-kconf.nix
@@ -39,6 +39,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_DEBUG_RODATA" = "y";
   "CONFIG_PGTABLE_LEVELS" = "4";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
   "CONFIG_IRQ_WORK" = "y";
@@ -140,6 +141,8 @@
   "CONFIG_SGETMASK_SYSCALL" = "y";
   "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
+  "CONFIG_KALLSYMS_ABSOLUTE_PERCPU" = "y";
+  "CONFIG_KALLSYMS_BASE_RELATIVE" = "y";
   "CONFIG_PRINTK" = "y";
   "CONFIG_BUG" = "y";
   "CONFIG_ELF_CORE" = "y";
@@ -209,6 +212,7 @@
   "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
   "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
+  "CONFIG_HAVE_STACK_VALIDATION" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
@@ -339,6 +343,8 @@
   "CONFIG_GENERIC_EARLY_IOREMAP" = "y";
   "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y";
   "CONFIG_FRAME_VECTOR" = "y";
+  "CONFIG_ARCH_USES_HIGH_VMA_FLAGS" = "y";
+  "CONFIG_ARCH_HAS_PKEYS" = "y";
   "CONFIG_X86_RESERVE_LOW" = "64";
   "CONFIG_MTRR" = "y";
   "CONFIG_MTRR_SANITIZER" = "y";
@@ -348,6 +354,7 @@
   "CONFIG_ARCH_USES_PG_UNCACHED" = "y";
   "CONFIG_ARCH_RANDOM" = "y";
   "CONFIG_X86_SMAP" = "y";
+  "CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS" = "y";
   "CONFIG_SECCOMP" = "y";
   "CONFIG_HZ_1000" = "y";
   "CONFIG_HZ" = "1000";
@@ -434,7 +441,6 @@
   "CONFIG_NET_UDP_TUNNEL" = "m";
   "CONFIG_NET_FOU" = "m";
   "CONFIG_INET_TUNNEL" = "m";
-  "CONFIG_INET_LRO" = "y";
   "CONFIG_INET_DIAG" = "y";
   "CONFIG_INET_TCP_DIAG" = "y";
   "CONFIG_INET_UDP_DIAG" = "y";
@@ -744,6 +750,9 @@
   "CONFIG_NET_ACT_VLAN" = "m";
   "CONFIG_NET_ACT_BPF" = "m";
   "CONFIG_NET_ACT_CONNMARK" = "m";
+  "CONFIG_NET_ACT_IFE" = "m";
+  "CONFIG_NET_IFE_SKBMARK" = "m";
+  "CONFIG_NET_IFE_SKBPRIO" = "m";
   "CONFIG_NET_CLS_IND" = "y";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
@@ -752,7 +761,6 @@
   "CONFIG_OPENVSWITCH" = "m";
   "CONFIG_OPENVSWITCH_VXLAN" = "m";
   "CONFIG_VSOCKETS" = "m";
-  "CONFIG_NETLINK_MMAP" = "y";
   "CONFIG_NETLINK_DIAG" = "m";
   "CONFIG_MPLS" = "y";
   "CONFIG_NET_MPLS_GSO" = "m";
@@ -771,6 +779,8 @@
   "CONFIG_NET_PKTGEN" = "m";
   "CONFIG_CEPH_LIB" = "m";
   "CONFIG_LWTUNNEL" = "y";
+  "CONFIG_DST_CACHE" = "y";
+  "CONFIG_MAY_USE_DEVLINK" = "y";
   "CONFIG_HAVE_BPF_JIT" = "y";
   "CONFIG_DEVTMPFS" = "y";
   "CONFIG_DEVTMPFS_MOUNT" = "y";
@@ -779,6 +789,7 @@
   "CONFIG_ALLOW_DEV_COREDUMP" = "y";
   "CONFIG_GENERIC_CPU_AUTOPROBE" = "y";
   "CONFIG_REGMAP" = "y";
+  "CONFIG_REGMAP_I2C" = "y";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -794,6 +805,9 @@
   "CONFIG_BLK_DEV_CRYPTOLOOP" = "m";
   "CONFIG_CDROM_PKTCDVD" = "y";
   "CONFIG_CDROM_PKTCDVD_BUFFERS" = "8";
+  "CONFIG_INTEL_MEI" = "m";
+  "CONFIG_INTEL_MEI_ME" = "m";
+  "CONFIG_INTEL_MEI_TXE" = "m";
   "CONFIG_HAVE_IDE" = "y";
   "CONFIG_SCSI_MOD" = "y";
   "CONFIG_SCSI" = "y";
@@ -829,6 +843,7 @@
   "CONFIG_NET_TEAM_MODE_LOADBALANCE" = "m";
   "CONFIG_VXLAN" = "m";
   "CONFIG_GENEVE" = "m";
+  "CONFIG_MACSEC" = "m";
   "CONFIG_NETCONSOLE" = "m";
   "CONFIG_NETPOLL" = "y";
   "CONFIG_NET_POLL_CONTROLLER" = "y";
@@ -840,6 +855,7 @@
   "CONFIG_ETHERNET" = "y";
   "CONFIG_NET_VENDOR_INTEL" = "y";
   "CONFIG_E1000E" = "y";
+  "CONFIG_E1000E_HWTS" = "y";
   "CONFIG_PPP" = "m";
   "CONFIG_PPP_BSDCOMP" = "m";
   "CONFIG_PPP_DEFLATE" = "m";
@@ -1022,6 +1038,7 @@
   "CONFIG_SND_HWDEP" = "y";
   "CONFIG_SND_RAWMIDI" = "m";
   "CONFIG_SND_JACK" = "y";
+  "CONFIG_SND_JACK_INPUT_DEV" = "y";
   "CONFIG_SND_SEQUENCER" = "y";
   "CONFIG_SND_SEQ_DUMMY" = "m";
   "CONFIG_SND_OSSEMUL" = "y";
@@ -1143,7 +1160,6 @@
   "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";
@@ -1182,6 +1198,7 @@
   "CONFIG_RTC_INTF_SYSFS" = "y";
   "CONFIG_RTC_INTF_PROC" = "y";
   "CONFIG_RTC_INTF_DEV" = "y";
+  "CONFIG_RTC_I2C_AND_SPI" = "y";
   "CONFIG_RTC_DRV_CMOS" = "y";
   "CONFIG_IRQ_BYPASS_MANAGER" = "m";
   "CONFIG_CLKEVT_I8253" = "y";
@@ -1193,6 +1210,7 @@
   "CONFIG_DMIID" = "y";
   "CONFIG_DMI_SYSFS" = "m";
   "CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK" = "y";
+  "CONFIG_FW_CFG_SYSFS" = "m";
   "CONFIG_UEFI_CPER" = "y";
   "CONFIG_DCACHE_WORD_ACCESS" = "y";
   "CONFIG_EXT2_FS" = "y";
@@ -1211,6 +1229,7 @@
   "CONFIG_FS_POSIX_ACL" = "y";
   "CONFIG_EXPORTFS" = "y";
   "CONFIG_FILE_LOCKING" = "y";
+  "CONFIG_FS_ENCRYPTION" = "m";
   "CONFIG_FSNOTIFY" = "y";
   "CONFIG_DNOTIFY" = "y";
   "CONFIG_INOTIFY_USER" = "y";
@@ -1228,6 +1247,7 @@
   "CONFIG_VFAT_FS" = "y";
   "CONFIG_FAT_DEFAULT_CODEPAGE" = "850";
   "CONFIG_FAT_DEFAULT_IOCHARSET" = "iso8859-1";
+  "CONFIG_FAT_DEFAULT_UTF8" = "y";
   "CONFIG_NTFS_FS" = "y";
   "CONFIG_PROC_FS" = "y";
   "CONFIG_PROC_SYSCTL" = "y";
@@ -1323,6 +1343,7 @@
   "CONFIG_HAVE_DEBUG_STACKOVERFLOW" = "y";
   "CONFIG_HAVE_ARCH_KMEMCHECK" = "y";
   "CONFIG_HAVE_ARCH_KASAN" = "y";
+  "CONFIG_ARCH_HAS_KCOV" = "y";
   "CONFIG_PANIC_ON_OOPS_VALUE" = "0";
   "CONFIG_PANIC_TIMEOUT" = "0";
   "CONFIG_SCHED_INFO" = "y";
@@ -1374,8 +1395,6 @@
   "CONFIG_CRYPTO_RNG" = "y";
   "CONFIG_CRYPTO_RNG2" = "y";
   "CONFIG_CRYPTO_RNG_DEFAULT" = "y";
-  "CONFIG_CRYPTO_PCOMP" = "y";
-  "CONFIG_CRYPTO_PCOMP2" = "y";
   "CONFIG_CRYPTO_AKCIPHER2" = "y";
   "CONFIG_CRYPTO_AKCIPHER" = "m";
   "CONFIG_CRYPTO_RSA" = "m";
@@ -1473,7 +1492,6 @@
   "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "y";
   "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "y";
   "CONFIG_CRYPTO_DEFLATE" = "y";
-  "CONFIG_CRYPTO_ZLIB" = "y";
   "CONFIG_CRYPTO_LZO" = "y";
   "CONFIG_CRYPTO_842" = "m";
   "CONFIG_CRYPTO_LZ4" = "y";
@@ -1491,7 +1509,6 @@
   "CONFIG_CRYPTO_HASH_INFO" = "y";
   "CONFIG_ASYMMETRIC_KEY_TYPE" = "y";
   "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "y";
-  "CONFIG_PUBLIC_KEY_ALGO_RSA" = "y";
   "CONFIG_X509_CERTIFICATE_PARSER" = "y";
   "CONFIG_PKCS7_MESSAGE_PARSER" = "m";
   "CONFIG_PKCS7_TEST_KEY" = "m";
diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix
index 539f0346..e805ba16 100644
--- a/machines/aszlig/mmrnmhrm-kconf.nix
+++ b/machines/aszlig/mmrnmhrm-kconf.nix
@@ -39,6 +39,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_DEBUG_RODATA" = "y";
   "CONFIG_PGTABLE_LEVELS" = "4";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
   "CONFIG_IRQ_WORK" = "y";
@@ -145,6 +146,8 @@
   "CONFIG_SGETMASK_SYSCALL" = "y";
   "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
+  "CONFIG_KALLSYMS_ABSOLUTE_PERCPU" = "y";
+  "CONFIG_KALLSYMS_BASE_RELATIVE" = "y";
   "CONFIG_PRINTK" = "y";
   "CONFIG_BUG" = "y";
   "CONFIG_ELF_CORE" = "y";
@@ -214,6 +217,7 @@
   "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
   "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
+  "CONFIG_HAVE_STACK_VALIDATION" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_ARCH_HAS_GCOV_PROFILE_ALL" = "y";
@@ -343,6 +347,8 @@
   "CONFIG_GENERIC_EARLY_IOREMAP" = "y";
   "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y";
   "CONFIG_FRAME_VECTOR" = "y";
+  "CONFIG_ARCH_USES_HIGH_VMA_FLAGS" = "y";
+  "CONFIG_ARCH_HAS_PKEYS" = "y";
   "CONFIG_X86_RESERVE_LOW" = "64";
   "CONFIG_MTRR" = "y";
   "CONFIG_MTRR_SANITIZER" = "y";
@@ -352,6 +358,7 @@
   "CONFIG_ARCH_USES_PG_UNCACHED" = "y";
   "CONFIG_ARCH_RANDOM" = "y";
   "CONFIG_X86_SMAP" = "y";
+  "CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS" = "y";
   "CONFIG_SECCOMP" = "y";
   "CONFIG_HZ_1000" = "y";
   "CONFIG_HZ" = "1000";
@@ -436,7 +443,6 @@
   "CONFIG_NET_UDP_TUNNEL" = "m";
   "CONFIG_NET_FOU" = "m";
   "CONFIG_INET_TUNNEL" = "m";
-  "CONFIG_INET_LRO" = "y";
   "CONFIG_INET_DIAG" = "y";
   "CONFIG_INET_TCP_DIAG" = "y";
   "CONFIG_INET_UDP_DIAG" = "y";
@@ -509,10 +515,12 @@
   "CONFIG_NET_ACT_CSUM" = "m";
   "CONFIG_NET_ACT_VLAN" = "m";
   "CONFIG_NET_ACT_BPF" = "m";
+  "CONFIG_NET_ACT_IFE" = "m";
+  "CONFIG_NET_IFE_SKBMARK" = "m";
+  "CONFIG_NET_IFE_SKBPRIO" = "m";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
   "CONFIG_VSOCKETS" = "y";
-  "CONFIG_NETLINK_MMAP" = "y";
   "CONFIG_NETLINK_DIAG" = "m";
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
@@ -524,6 +532,8 @@
   "CONFIG_BPF_JIT" = "y";
   "CONFIG_NET_FLOW_LIMIT" = "y";
   "CONFIG_LWTUNNEL" = "y";
+  "CONFIG_DST_CACHE" = "y";
+  "CONFIG_MAY_USE_DEVLINK" = "y";
   "CONFIG_HAVE_BPF_JIT" = "y";
   "CONFIG_DEVTMPFS" = "y";
   "CONFIG_DEVTMPFS_MOUNT" = "y";
@@ -533,6 +543,7 @@
   "CONFIG_ALLOW_DEV_COREDUMP" = "y";
   "CONFIG_GENERIC_CPU_AUTOPROBE" = "y";
   "CONFIG_REGMAP" = "y";
+  "CONFIG_REGMAP_I2C" = "y";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -551,6 +562,9 @@
   "CONFIG_VIRTIO_BLK" = "m";
   "CONFIG_EEPROM_AT24" = "m";
   "CONFIG_EEPROM_93CX6" = "m";
+  "CONFIG_INTEL_MEI" = "m";
+  "CONFIG_INTEL_MEI_ME" = "m";
+  "CONFIG_INTEL_MEI_TXE" = "m";
   "CONFIG_HAVE_IDE" = "y";
   "CONFIG_SCSI_MOD" = "y";
   "CONFIG_SCSI" = "y";
@@ -575,6 +589,7 @@
   "CONFIG_NET_CORE" = "y";
   "CONFIG_VXLAN" = "m";
   "CONFIG_GENEVE" = "m";
+  "CONFIG_MACSEC" = "m";
   "CONFIG_VIRTIO_NET" = "m";
   "CONFIG_NLMON" = "m";
   "CONFIG_VHOST_NET" = "m";
@@ -715,6 +730,7 @@
   "CONFIG_SND_HWDEP" = "y";
   "CONFIG_SND_RAWMIDI" = "y";
   "CONFIG_SND_JACK" = "y";
+  "CONFIG_SND_JACK_INPUT_DEV" = "y";
   "CONFIG_SND_SEQUENCER" = "y";
   "CONFIG_SND_SEQ_DUMMY" = "m";
   "CONFIG_SND_OSSEMUL" = "y";
@@ -819,7 +835,6 @@
   "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";
@@ -859,6 +874,7 @@
   "CONFIG_RTC_INTF_SYSFS" = "y";
   "CONFIG_RTC_INTF_PROC" = "y";
   "CONFIG_RTC_INTF_DEV" = "y";
+  "CONFIG_RTC_I2C_AND_SPI" = "y";
   "CONFIG_RTC_DRV_CMOS" = "y";
   "CONFIG_IRQ_BYPASS_MANAGER" = "y";
   "CONFIG_VIRT_DRIVERS" = "y";
@@ -878,12 +894,14 @@
   "CONFIG_RAS" = "y";
   "CONFIG_LIBNVDIMM" = "m";
   "CONFIG_ND_BLK" = "m";
+  "CONFIG_NVMEM" = "m";
   "CONFIG_FIRMWARE_MEMMAP" = "y";
   "CONFIG_DELL_RBU" = "y";
   "CONFIG_DCDBAS" = "y";
   "CONFIG_DMIID" = "y";
   "CONFIG_DMI_SYSFS" = "y";
   "CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK" = "y";
+  "CONFIG_FW_CFG_SYSFS" = "m";
   "CONFIG_UEFI_CPER" = "y";
   "CONFIG_DCACHE_WORD_ACCESS" = "y";
   "CONFIG_EXT2_FS" = "y";
@@ -895,6 +913,7 @@
   "CONFIG_FS_POSIX_ACL" = "y";
   "CONFIG_EXPORTFS" = "y";
   "CONFIG_FILE_LOCKING" = "y";
+  "CONFIG_FS_ENCRYPTION" = "m";
   "CONFIG_FSNOTIFY" = "y";
   "CONFIG_DNOTIFY" = "y";
   "CONFIG_INOTIFY_USER" = "y";
@@ -915,6 +934,7 @@
   "CONFIG_VFAT_FS" = "m";
   "CONFIG_FAT_DEFAULT_CODEPAGE" = "437";
   "CONFIG_FAT_DEFAULT_IOCHARSET" = "utf8";
+  "CONFIG_FAT_DEFAULT_UTF8" = "y";
   "CONFIG_NTFS_FS" = "m";
   "CONFIG_NTFS_RW" = "y";
   "CONFIG_PROC_FS" = "y";
@@ -1024,6 +1044,7 @@
   "CONFIG_HAVE_DEBUG_STACKOVERFLOW" = "y";
   "CONFIG_HAVE_ARCH_KMEMCHECK" = "y";
   "CONFIG_HAVE_ARCH_KASAN" = "y";
+  "CONFIG_ARCH_HAS_KCOV" = "y";
   "CONFIG_PANIC_ON_OOPS_VALUE" = "0";
   "CONFIG_PANIC_TIMEOUT" = "0";
   "CONFIG_SCHED_INFO" = "y";
@@ -1076,8 +1097,6 @@
   "CONFIG_CRYPTO_RNG" = "y";
   "CONFIG_CRYPTO_RNG2" = "y";
   "CONFIG_CRYPTO_RNG_DEFAULT" = "y";
-  "CONFIG_CRYPTO_PCOMP" = "y";
-  "CONFIG_CRYPTO_PCOMP2" = "y";
   "CONFIG_CRYPTO_AKCIPHER2" = "y";
   "CONFIG_CRYPTO_AKCIPHER" = "m";
   "CONFIG_CRYPTO_RSA" = "m";
@@ -1175,7 +1194,6 @@
   "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "m";
   "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "m";
   "CONFIG_CRYPTO_DEFLATE" = "y";
-  "CONFIG_CRYPTO_ZLIB" = "y";
   "CONFIG_CRYPTO_LZO" = "y";
   "CONFIG_CRYPTO_842" = "m";
   "CONFIG_CRYPTO_LZ4" = "y";
@@ -1193,7 +1211,6 @@
   "CONFIG_CRYPTO_HASH_INFO" = "y";
   "CONFIG_ASYMMETRIC_KEY_TYPE" = "m";
   "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "m";
-  "CONFIG_PUBLIC_KEY_ALGO_RSA" = "m";
   "CONFIG_X509_CERTIFICATE_PARSER" = "m";
   "CONFIG_PKCS7_MESSAGE_PARSER" = "m";
   "CONFIG_PKCS7_TEST_KEY" = "m";