Commit 733df11c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v5.1-rc1 



Actual changes:
     -CONFIG_FS_ENCRYPTION=m
     -CONFIG_NET_DEVLINK=m
     -CONFIG_NFT_CHAIN_NAT_IPV4=m
     -CONFIG_NFT_CHAIN_NAT_IPV6=m
     -CONFIG_NFT_MASQ_IPV4=m
     -CONFIG_NFT_MASQ_IPV6=m
     -CONFIG_NFT_REDIR_IPV4=m
     -CONFIG_NFT_REDIR_IPV6=m
     +CONFIG_CRYPTO_CTS=m
     +CONFIG_CRYPTO_XTS=m
     +CONFIG_TEST_STACKINIT=m
     +CONFIG_TEST_VMALLOC=m
     +# CONFIG_VALIDATE_FS_PARSER is not set
     +CONFIG_XDP_SOCKETS_DIAG=m

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 19999a8b

arch/m68k/configs/amiga_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_TLS=m 
CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y
@@ -210,9 +211,6 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -234,9 +232,6 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -313,7 +308,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -460,12 +454,12 @@ CONFIG_RTC_DRV_RP5C01=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -573,9 +567,11 @@ CONFIG_CRYPTO_AEGIS256=m 
CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m
@@ -640,6 +636,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m
@@ -649,4 +646,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/apollo_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ CONFIG_TLS=m 
CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y
@@ -206,9 +207,6 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -230,9 +228,6 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -309,7 +304,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -420,12 +414,12 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -533,9 +527,11 @@ CONFIG_CRYPTO_AEGIS256=m 
CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m
@@ -600,6 +596,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m
@@ -609,4 +606,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/atari_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ CONFIG_TLS=m 
CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y
@@ -213,9 +214,6 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -237,9 +235,6 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -316,7 +311,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -442,12 +436,12 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -555,9 +549,11 @@ CONFIG_CRYPTO_AEGIS256=m 
CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m
@@ -622,6 +618,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m
@@ -631,4 +628,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/bvme6000_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ CONFIG_TLS=m 
CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y
@@ -203,9 +204,6 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -227,9 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -306,7 +301,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -413,12 +407,12 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -526,9 +520,11 @@ CONFIG_CRYPTO_AEGIS256=m 
CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m
@@ -593,6 +589,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m
@@ -602,4 +599,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/hp300_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ CONFIG_TLS=m 
CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y
@@ -205,9 +206,6 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -229,9 +227,6 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -308,7 +303,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -422,12 +416,12 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -535,9 +529,11 @@ CONFIG_CRYPTO_AEGIS256=m 
CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m
@@ -602,6 +598,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m
@@ -611,4 +608,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_EARLY_PRINTK=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE