Skip to content

Commit 693a035

Browse files
rucoderrucoder
committed
Update defconfigs to 6.17.1 version
As usual the sequence is - copy defconfig to .config - make olddefconfig - make savedefconfig - copy defconfig back Signed-off-by: Mikhail Malyshev <mike.malyshev@gmail.com>
1 parent 5d1a4df commit 693a035

File tree

2 files changed

+6
-64
lines changed

2 files changed

+6
-64
lines changed

‎arch/x86/configs/eve-core_defconfig‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
6161
CONFIG_X86_MCELOG_LEGACY=y
6262
CONFIG_X86_MSR=y
6363
CONFIG_X86_CPUID=y
64-
# CONFIG_X86_5LEVEL is not set
6564
CONFIG_EFI=y
6665
CONFIG_EFI_STUB=y
6766
CONFIG_HZ_100=y
@@ -206,10 +205,8 @@ CONFIG_NETFILTER_XT_TARGET_LOG=y
206205
CONFIG_NETFILTER_XT_TARGET_MARK=y
207206
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
208207
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
209-
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
210208
CONFIG_NETFILTER_XT_TARGET_TEE=y
211209
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
212-
CONFIG_NETFILTER_XT_TARGET_TRACE=y
213210
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
214211
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
215212
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
@@ -298,19 +295,9 @@ CONFIG_IP_NF_MATCH_AH=y
298295
CONFIG_IP_NF_MATCH_ECN=y
299296
CONFIG_IP_NF_MATCH_RPFILTER=y
300297
CONFIG_IP_NF_MATCH_TTL=y
301-
CONFIG_IP_NF_FILTER=y
302298
CONFIG_IP_NF_TARGET_REJECT=y
303299
CONFIG_IP_NF_TARGET_SYNPROXY=y
304-
CONFIG_IP_NF_NAT=y
305-
CONFIG_IP_NF_TARGET_MASQUERADE=y
306-
CONFIG_IP_NF_TARGET_NETMAP=y
307-
CONFIG_IP_NF_TARGET_REDIRECT=y
308-
CONFIG_IP_NF_MANGLE=y
309300
CONFIG_IP_NF_TARGET_ECN=y
310-
CONFIG_IP_NF_TARGET_TTL=y
311-
CONFIG_IP_NF_RAW=y
312-
CONFIG_IP_NF_SECURITY=y
313-
CONFIG_IP_NF_ARPFILTER=y
314301
CONFIG_IP_NF_ARP_MANGLE=y
315302
CONFIG_NFT_DUP_IPV6=y
316303
CONFIG_IP6_NF_IPTABLES=y
@@ -323,23 +310,13 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=y
323310
CONFIG_IP6_NF_MATCH_MH=y
324311
CONFIG_IP6_NF_MATCH_RPFILTER=y
325312
CONFIG_IP6_NF_MATCH_RT=y
326-
CONFIG_IP6_NF_TARGET_HL=y
327-
CONFIG_IP6_NF_FILTER=y
328313
CONFIG_IP6_NF_TARGET_REJECT=y
329314
CONFIG_IP6_NF_TARGET_SYNPROXY=y
330-
CONFIG_IP6_NF_MANGLE=y
331-
CONFIG_IP6_NF_RAW=y
332-
CONFIG_IP6_NF_SECURITY=y
333-
CONFIG_IP6_NF_NAT=y
334-
CONFIG_IP6_NF_TARGET_MASQUERADE=y
335315
CONFIG_IP6_NF_TARGET_NPT=y
336316
CONFIG_NF_TABLES_BRIDGE=y
337317
CONFIG_NFT_BRIDGE_META=y
338318
CONFIG_NFT_BRIDGE_REJECT=y
339319
CONFIG_BRIDGE_NF_EBTABLES=y
340-
CONFIG_BRIDGE_EBT_BROUTE=y
341-
CONFIG_BRIDGE_EBT_T_FILTER=y
342-
CONFIG_BRIDGE_EBT_T_NAT=y
343320
CONFIG_BRIDGE_EBT_802_3=y
344321
CONFIG_BRIDGE_EBT_AMONG=y
345322
CONFIG_BRIDGE_EBT_ARP=y
@@ -766,13 +743,13 @@ CONFIG_FB_EFI=y
766743
CONFIG_FB_SIMPLE=y
767744
CONFIG_FRAMEBUFFER_CONSOLE=y
768745
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
746+
CONFIG_INTEL_ISH_HID=m
747+
CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
769748
CONFIG_USB_HID=m
770749
CONFIG_HID_PID=y
771750
CONFIG_USB_HIDDEV=y
772751
CONFIG_USB_KBD=m
773752
CONFIG_USB_MOUSE=m
774-
CONFIG_INTEL_ISH_HID=m
775-
CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
776753
CONFIG_USB=y
777754
CONFIG_USB_XHCI_HCD=y
778755
CONFIG_USB_EHCI_HCD=y
@@ -935,10 +912,10 @@ CONFIG_KEY_DH_OPERATIONS=y
935912
CONFIG_SECURITY_DMESG_RESTRICT=y
936913
CONFIG_SECURITY=y
937914
CONFIG_SECURITY_NETWORK_XFRM=y
938-
CONFIG_HARDENED_USERCOPY=y
939915
CONFIG_SECURITY_APPARMOR=y
940916
CONFIG_SECURITY_YAMA=y
941917
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor"
918+
CONFIG_HARDENED_USERCOPY=y
942919
CONFIG_CRYPTO_USER=y
943920
CONFIG_CRYPTO_ANUBIS=y
944921
CONFIG_CRYPTO_BLOWFISH=y
@@ -951,15 +928,13 @@ CONFIG_CRYPTO_TEA=y
951928
CONFIG_CRYPTO_TWOFISH=y
952929
CONFIG_CRYPTO_ADIANTUM=y
953930
CONFIG_CRYPTO_ARC4=y
954-
CONFIG_CRYPTO_KEYWRAP=y
955931
CONFIG_CRYPTO_LRW=y
956932
CONFIG_CRYPTO_PCBC=y
957933
CONFIG_CRYPTO_CHACHA20POLY1305=y
958934
CONFIG_CRYPTO_ESSIV=y
959935
CONFIG_CRYPTO_MD4=y
960936
CONFIG_CRYPTO_MICHAEL_MIC=y
961937
CONFIG_CRYPTO_RMD160=y
962-
CONFIG_CRYPTO_VMAC=y
963938
CONFIG_CRYPTO_WP512=y
964939
CONFIG_CRYPTO_XCBC=y
965940
CONFIG_CRYPTO_CRC32=y
@@ -981,11 +956,7 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=y
981956
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
982957
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=y
983958
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=y
984-
CONFIG_CRYPTO_SHA1_SSSE3=y
985-
CONFIG_CRYPTO_SHA256_SSSE3=y
986-
CONFIG_CRYPTO_SHA512_SSSE3=y
987959
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
988-
CONFIG_CRYPTO_CRC32_PCLMUL=y
989960
CONFIG_CRYPTO_DEV_PADLOCK=y
990961
CONFIG_CRYPTO_DEV_PADLOCK_AES=y
991962
CONFIG_CRYPTO_DEV_PADLOCK_SHA=y

‎arch/x86/configs/eve-hwe_defconfig‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
6161
CONFIG_X86_MCELOG_LEGACY=y
6262
CONFIG_X86_MSR=y
6363
CONFIG_X86_CPUID=y
64-
# CONFIG_X86_5LEVEL is not set
6564
CONFIG_EFI=y
6665
CONFIG_EFI_STUB=y
6766
CONFIG_HZ_100=y
@@ -206,10 +205,8 @@ CONFIG_NETFILTER_XT_TARGET_LOG=y
206205
CONFIG_NETFILTER_XT_TARGET_MARK=y
207206
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
208207
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
209-
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
210208
CONFIG_NETFILTER_XT_TARGET_TEE=y
211209
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
212-
CONFIG_NETFILTER_XT_TARGET_TRACE=y
213210
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
214211
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
215212
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
@@ -298,19 +295,9 @@ CONFIG_IP_NF_MATCH_AH=y
298295
CONFIG_IP_NF_MATCH_ECN=y
299296
CONFIG_IP_NF_MATCH_RPFILTER=y
300297
CONFIG_IP_NF_MATCH_TTL=y
301-
CONFIG_IP_NF_FILTER=y
302298
CONFIG_IP_NF_TARGET_REJECT=y
303299
CONFIG_IP_NF_TARGET_SYNPROXY=y
304-
CONFIG_IP_NF_NAT=y
305-
CONFIG_IP_NF_TARGET_MASQUERADE=y
306-
CONFIG_IP_NF_TARGET_NETMAP=y
307-
CONFIG_IP_NF_TARGET_REDIRECT=y
308-
CONFIG_IP_NF_MANGLE=y
309300
CONFIG_IP_NF_TARGET_ECN=y
310-
CONFIG_IP_NF_TARGET_TTL=y
311-
CONFIG_IP_NF_RAW=y
312-
CONFIG_IP_NF_SECURITY=y
313-
CONFIG_IP_NF_ARPFILTER=y
314301
CONFIG_IP_NF_ARP_MANGLE=y
315302
CONFIG_NFT_DUP_IPV6=y
316303
CONFIG_IP6_NF_IPTABLES=y
@@ -323,23 +310,13 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=y
323310
CONFIG_IP6_NF_MATCH_MH=y
324311
CONFIG_IP6_NF_MATCH_RPFILTER=y
325312
CONFIG_IP6_NF_MATCH_RT=y
326-
CONFIG_IP6_NF_TARGET_HL=y
327-
CONFIG_IP6_NF_FILTER=y
328313
CONFIG_IP6_NF_TARGET_REJECT=y
329314
CONFIG_IP6_NF_TARGET_SYNPROXY=y
330-
CONFIG_IP6_NF_MANGLE=y
331-
CONFIG_IP6_NF_RAW=y
332-
CONFIG_IP6_NF_SECURITY=y
333-
CONFIG_IP6_NF_NAT=y
334-
CONFIG_IP6_NF_TARGET_MASQUERADE=y
335315
CONFIG_IP6_NF_TARGET_NPT=y
336316
CONFIG_NF_TABLES_BRIDGE=y
337317
CONFIG_NFT_BRIDGE_META=y
338318
CONFIG_NFT_BRIDGE_REJECT=y
339319
CONFIG_BRIDGE_NF_EBTABLES=y
340-
CONFIG_BRIDGE_EBT_BROUTE=y
341-
CONFIG_BRIDGE_EBT_T_FILTER=y
342-
CONFIG_BRIDGE_EBT_T_NAT=y
343320
CONFIG_BRIDGE_EBT_802_3=y
344321
CONFIG_BRIDGE_EBT_AMONG=y
345322
CONFIG_BRIDGE_EBT_ARP=y
@@ -765,13 +742,13 @@ CONFIG_FB_EFI=y
765742
CONFIG_FB_SIMPLE=y
766743
CONFIG_FRAMEBUFFER_CONSOLE=y
767744
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
745+
CONFIG_INTEL_ISH_HID=m
746+
CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
768747
CONFIG_USB_HID=m
769748
CONFIG_HID_PID=y
770749
CONFIG_USB_HIDDEV=y
771750
CONFIG_USB_KBD=m
772751
CONFIG_USB_MOUSE=m
773-
CONFIG_INTEL_ISH_HID=m
774-
CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
775752
CONFIG_USB=y
776753
CONFIG_USB_XHCI_HCD=y
777754
CONFIG_USB_EHCI_HCD=y
@@ -935,10 +912,10 @@ CONFIG_KEY_DH_OPERATIONS=y
935912
CONFIG_SECURITY_DMESG_RESTRICT=y
936913
CONFIG_SECURITY=y
937914
CONFIG_SECURITY_NETWORK_XFRM=y
938-
CONFIG_HARDENED_USERCOPY=y
939915
CONFIG_SECURITY_APPARMOR=y
940916
CONFIG_SECURITY_YAMA=y
941917
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor"
918+
CONFIG_HARDENED_USERCOPY=y
942919
CONFIG_CRYPTO_USER=y
943920
CONFIG_CRYPTO_ANUBIS=y
944921
CONFIG_CRYPTO_BLOWFISH=y
@@ -951,15 +928,13 @@ CONFIG_CRYPTO_TEA=y
951928
CONFIG_CRYPTO_TWOFISH=y
952929
CONFIG_CRYPTO_ADIANTUM=y
953930
CONFIG_CRYPTO_ARC4=y
954-
CONFIG_CRYPTO_KEYWRAP=y
955931
CONFIG_CRYPTO_LRW=y
956932
CONFIG_CRYPTO_PCBC=y
957933
CONFIG_CRYPTO_CHACHA20POLY1305=y
958934
CONFIG_CRYPTO_ESSIV=y
959935
CONFIG_CRYPTO_MD4=y
960936
CONFIG_CRYPTO_MICHAEL_MIC=y
961937
CONFIG_CRYPTO_RMD160=y
962-
CONFIG_CRYPTO_VMAC=y
963938
CONFIG_CRYPTO_WP512=y
964939
CONFIG_CRYPTO_XCBC=y
965940
CONFIG_CRYPTO_CRC32=y
@@ -981,11 +956,7 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=y
981956
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
982957
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=y
983958
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=y
984-
CONFIG_CRYPTO_SHA1_SSSE3=y
985-
CONFIG_CRYPTO_SHA256_SSSE3=y
986-
CONFIG_CRYPTO_SHA512_SSSE3=y
987959
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
988-
CONFIG_CRYPTO_CRC32_PCLMUL=y
989960
CONFIG_CRYPTO_DEV_PADLOCK=y
990961
CONFIG_CRYPTO_DEV_PADLOCK_AES=y
991962
CONFIG_CRYPTO_DEV_PADLOCK_SHA=y

0 commit comments

Comments
 (0)