diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-02-04 15:19:17 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-03-31 09:07:24 -0400 |
commit | 50be9eba831da114e1979726f4119d342698e651 (patch) | |
tree | 1d3a7a5bed66bc3255e0487e66b3beaf9533e956 | |
parent | eff9cf8d6e8b048f2f744a1cc382e213a00f3d2c (diff) |
m68k: Update defconfigs for v3.14-rc1
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 10 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 10 |
12 files changed, 72 insertions, 48 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 559ff3af8ff7..96da4963d14b 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y | |||
24 | # CONFIG_EFI_PARTITION is not set | 24 | # CONFIG_EFI_PARTITION is not set |
25 | CONFIG_SYSV68_PARTITION=y | 25 | CONFIG_SYSV68_PARTITION=y |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68020=y | 29 | CONFIG_M68020=y |
28 | CONFIG_M68030=y | 30 | CONFIG_M68030=y |
29 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
@@ -85,6 +87,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
85 | CONFIG_NF_CONNTRACK_SIP=m | 87 | CONFIG_NF_CONNTRACK_SIP=m |
86 | CONFIG_NF_CONNTRACK_TFTP=m | 88 | CONFIG_NF_CONNTRACK_TFTP=m |
87 | CONFIG_NF_TABLES=m | 89 | CONFIG_NF_TABLES=m |
90 | CONFIG_NF_TABLES_INET=m | ||
88 | CONFIG_NFT_EXTHDR=m | 91 | CONFIG_NFT_EXTHDR=m |
89 | CONFIG_NFT_META=m | 92 | CONFIG_NFT_META=m |
90 | CONFIG_NFT_CT=m | 93 | CONFIG_NFT_CT=m |
@@ -94,6 +97,8 @@ CONFIG_NFT_COUNTER=m | |||
94 | CONFIG_NFT_LOG=m | 97 | CONFIG_NFT_LOG=m |
95 | CONFIG_NFT_LIMIT=m | 98 | CONFIG_NFT_LIMIT=m |
96 | CONFIG_NFT_NAT=m | 99 | CONFIG_NFT_NAT=m |
100 | CONFIG_NFT_QUEUE=m | ||
101 | CONFIG_NFT_REJECT=m | ||
97 | CONFIG_NFT_COMPAT=m | 102 | CONFIG_NFT_COMPAT=m |
98 | CONFIG_NETFILTER_XT_SET=m | 103 | CONFIG_NETFILTER_XT_SET=m |
99 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 104 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -126,6 +131,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
126 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 131 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
127 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 132 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
128 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 133 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
134 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
129 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 135 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
130 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 136 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
131 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 137 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -163,8 +169,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
163 | CONFIG_IP_SET_HASH_NETIFACE=m | 169 | CONFIG_IP_SET_HASH_NETIFACE=m |
164 | CONFIG_IP_SET_LIST_SET=m | 170 | CONFIG_IP_SET_LIST_SET=m |
165 | CONFIG_NF_CONNTRACK_IPV4=m | 171 | CONFIG_NF_CONNTRACK_IPV4=m |
166 | CONFIG_NF_TABLES_IPV4=m | ||
167 | CONFIG_NFT_REJECT_IPV4=m | ||
168 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 172 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
169 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 173 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
170 | CONFIG_NF_TABLES_ARP=m | 174 | CONFIG_NF_TABLES_ARP=m |
@@ -190,7 +194,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
190 | CONFIG_IP_NF_ARPFILTER=m | 194 | CONFIG_IP_NF_ARPFILTER=m |
191 | CONFIG_IP_NF_ARP_MANGLE=m | 195 | CONFIG_IP_NF_ARP_MANGLE=m |
192 | CONFIG_NF_CONNTRACK_IPV6=m | 196 | CONFIG_NF_CONNTRACK_IPV6=m |
193 | CONFIG_NF_TABLES_IPV6=m | ||
194 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 197 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
195 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 198 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
196 | CONFIG_IP6_NF_IPTABLES=m | 199 | CONFIG_IP6_NF_IPTABLES=m |
@@ -512,7 +515,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
512 | CONFIG_CRYPTO_USER_API_HASH=m | 515 | CONFIG_CRYPTO_USER_API_HASH=m |
513 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 516 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
514 | # CONFIG_CRYPTO_HW is not set | 517 | # CONFIG_CRYPTO_HW is not set |
515 | CONFIG_CRC_T10DIF=y | ||
516 | CONFIG_XZ_DEC_X86=y | 518 | CONFIG_XZ_DEC_X86=y |
517 | CONFIG_XZ_DEC_POWERPC=y | 519 | CONFIG_XZ_DEC_POWERPC=y |
518 | CONFIG_XZ_DEC_IA64=y | 520 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index cb1f55df69b6..1b8739f50cbf 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y | |||
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
28 | CONFIG_KEXEC=y | ||
29 | CONFIG_BOOTINFO_PROC=y | ||
28 | CONFIG_M68020=y | 30 | CONFIG_M68020=y |
29 | CONFIG_M68030=y | 31 | CONFIG_M68030=y |
30 | CONFIG_M68040=y | 32 | CONFIG_M68040=y |
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
83 | CONFIG_NF_CONNTRACK_SIP=m | 85 | CONFIG_NF_CONNTRACK_SIP=m |
84 | CONFIG_NF_CONNTRACK_TFTP=m | 86 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NF_TABLES=m | 87 | CONFIG_NF_TABLES=m |
88 | CONFIG_NF_TABLES_INET=m | ||
86 | CONFIG_NFT_EXTHDR=m | 89 | CONFIG_NFT_EXTHDR=m |
87 | CONFIG_NFT_META=m | 90 | CONFIG_NFT_META=m |
88 | CONFIG_NFT_CT=m | 91 | CONFIG_NFT_CT=m |
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m | |||
92 | CONFIG_NFT_LOG=m | 95 | CONFIG_NFT_LOG=m |
93 | CONFIG_NFT_LIMIT=m | 96 | CONFIG_NFT_LIMIT=m |
94 | CONFIG_NFT_NAT=m | 97 | CONFIG_NFT_NAT=m |
98 | CONFIG_NFT_QUEUE=m | ||
99 | CONFIG_NFT_REJECT=m | ||
95 | CONFIG_NFT_COMPAT=m | 100 | CONFIG_NFT_COMPAT=m |
96 | CONFIG_NETFILTER_XT_SET=m | 101 | CONFIG_NETFILTER_XT_SET=m |
97 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 102 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
124 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 129 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
125 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 130 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
126 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 131 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
132 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
127 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 133 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
128 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 134 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
129 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 135 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
161 | CONFIG_IP_SET_HASH_NETIFACE=m | 167 | CONFIG_IP_SET_HASH_NETIFACE=m |
162 | CONFIG_IP_SET_LIST_SET=m | 168 | CONFIG_IP_SET_LIST_SET=m |
163 | CONFIG_NF_CONNTRACK_IPV4=m | 169 | CONFIG_NF_CONNTRACK_IPV4=m |
164 | CONFIG_NF_TABLES_IPV4=m | ||
165 | CONFIG_NFT_REJECT_IPV4=m | ||
166 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 170 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
167 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 171 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
168 | CONFIG_NF_TABLES_ARP=m | 172 | CONFIG_NF_TABLES_ARP=m |
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
188 | CONFIG_IP_NF_ARPFILTER=m | 192 | CONFIG_IP_NF_ARPFILTER=m |
189 | CONFIG_IP_NF_ARP_MANGLE=m | 193 | CONFIG_IP_NF_ARP_MANGLE=m |
190 | CONFIG_NF_CONNTRACK_IPV6=m | 194 | CONFIG_NF_CONNTRACK_IPV6=m |
191 | CONFIG_NF_TABLES_IPV6=m | ||
192 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 195 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
193 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 196 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
194 | CONFIG_IP6_NF_IPTABLES=m | 197 | CONFIG_IP6_NF_IPTABLES=m |
@@ -470,7 +473,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
470 | CONFIG_CRYPTO_USER_API_HASH=m | 473 | CONFIG_CRYPTO_USER_API_HASH=m |
471 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 474 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
472 | # CONFIG_CRYPTO_HW is not set | 475 | # CONFIG_CRYPTO_HW is not set |
473 | CONFIG_CRC_T10DIF=y | ||
474 | CONFIG_XZ_DEC_X86=y | 476 | CONFIG_XZ_DEC_X86=y |
475 | CONFIG_XZ_DEC_POWERPC=y | 477 | CONFIG_XZ_DEC_POWERPC=y |
476 | CONFIG_XZ_DEC_IA64=y | 478 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index e880cfbb62d9..6ea4e91f0caa 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y | |||
24 | # CONFIG_EFI_PARTITION is not set | 24 | # CONFIG_EFI_PARTITION is not set |
25 | CONFIG_SYSV68_PARTITION=y | 25 | CONFIG_SYSV68_PARTITION=y |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68020=y | 29 | CONFIG_M68020=y |
28 | CONFIG_M68030=y | 30 | CONFIG_M68030=y |
29 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
82 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
83 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
84 | CONFIG_NF_TABLES=m | 86 | CONFIG_NF_TABLES=m |
87 | CONFIG_NF_TABLES_INET=m | ||
85 | CONFIG_NFT_EXTHDR=m | 88 | CONFIG_NFT_EXTHDR=m |
86 | CONFIG_NFT_META=m | 89 | CONFIG_NFT_META=m |
87 | CONFIG_NFT_CT=m | 90 | CONFIG_NFT_CT=m |
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m | |||
91 | CONFIG_NFT_LOG=m | 94 | CONFIG_NFT_LOG=m |
92 | CONFIG_NFT_LIMIT=m | 95 | CONFIG_NFT_LIMIT=m |
93 | CONFIG_NFT_NAT=m | 96 | CONFIG_NFT_NAT=m |
97 | CONFIG_NFT_QUEUE=m | ||
98 | CONFIG_NFT_REJECT=m | ||
94 | CONFIG_NFT_COMPAT=m | 99 | CONFIG_NFT_COMPAT=m |
95 | CONFIG_NETFILTER_XT_SET=m | 100 | CONFIG_NETFILTER_XT_SET=m |
96 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 101 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
123 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 128 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
124 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 129 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
125 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 130 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
131 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
126 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 132 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
127 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 133 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
128 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 134 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
160 | CONFIG_IP_SET_HASH_NETIFACE=m | 166 | CONFIG_IP_SET_HASH_NETIFACE=m |
161 | CONFIG_IP_SET_LIST_SET=m | 167 | CONFIG_IP_SET_LIST_SET=m |
162 | CONFIG_NF_CONNTRACK_IPV4=m | 168 | CONFIG_NF_CONNTRACK_IPV4=m |
163 | CONFIG_NF_TABLES_IPV4=m | ||
164 | CONFIG_NFT_REJECT_IPV4=m | ||
165 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 169 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
166 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 170 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
167 | CONFIG_NF_TABLES_ARP=m | 171 | CONFIG_NF_TABLES_ARP=m |
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
187 | CONFIG_IP_NF_ARPFILTER=m | 191 | CONFIG_IP_NF_ARPFILTER=m |
188 | CONFIG_IP_NF_ARP_MANGLE=m | 192 | CONFIG_IP_NF_ARP_MANGLE=m |
189 | CONFIG_NF_CONNTRACK_IPV6=m | 193 | CONFIG_NF_CONNTRACK_IPV6=m |
190 | CONFIG_NF_TABLES_IPV6=m | ||
191 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 194 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
192 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 195 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
193 | CONFIG_IP6_NF_IPTABLES=m | 196 | CONFIG_IP6_NF_IPTABLES=m |
@@ -487,7 +490,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
487 | CONFIG_CRYPTO_USER_API_HASH=m | 490 | CONFIG_CRYPTO_USER_API_HASH=m |
488 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 491 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
489 | # CONFIG_CRYPTO_HW is not set | 492 | # CONFIG_CRYPTO_HW is not set |
490 | CONFIG_CRC_T10DIF=y | ||
491 | CONFIG_XZ_DEC_X86=y | 493 | CONFIG_XZ_DEC_X86=y |
492 | CONFIG_XZ_DEC_POWERPC=y | 494 | CONFIG_XZ_DEC_POWERPC=y |
493 | CONFIG_XZ_DEC_IA64=y | 495 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 4aa4f45e52a8..e5a12739ff2d 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
24 | CONFIG_SUN_PARTITION=y | 24 | CONFIG_SUN_PARTITION=y |
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
28 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
29 | CONFIG_VME=y | 31 | CONFIG_VME=y |
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
81 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
82 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
83 | CONFIG_NF_TABLES=m | 85 | CONFIG_NF_TABLES=m |
86 | CONFIG_NF_TABLES_INET=m | ||
84 | CONFIG_NFT_EXTHDR=m | 87 | CONFIG_NFT_EXTHDR=m |
85 | CONFIG_NFT_META=m | 88 | CONFIG_NFT_META=m |
86 | CONFIG_NFT_CT=m | 89 | CONFIG_NFT_CT=m |
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m | |||
90 | CONFIG_NFT_LOG=m | 93 | CONFIG_NFT_LOG=m |
91 | CONFIG_NFT_LIMIT=m | 94 | CONFIG_NFT_LIMIT=m |
92 | CONFIG_NFT_NAT=m | 95 | CONFIG_NFT_NAT=m |
96 | CONFIG_NFT_QUEUE=m | ||
97 | CONFIG_NFT_REJECT=m | ||
93 | CONFIG_NFT_COMPAT=m | 98 | CONFIG_NFT_COMPAT=m |
94 | CONFIG_NETFILTER_XT_SET=m | 99 | CONFIG_NETFILTER_XT_SET=m |
95 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 100 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
122 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 127 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
123 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 128 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
124 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 129 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
130 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
125 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 131 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
126 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 132 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
127 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 133 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
159 | CONFIG_IP_SET_HASH_NETIFACE=m | 165 | CONFIG_IP_SET_HASH_NETIFACE=m |
160 | CONFIG_IP_SET_LIST_SET=m | 166 | CONFIG_IP_SET_LIST_SET=m |
161 | CONFIG_NF_CONNTRACK_IPV4=m | 167 | CONFIG_NF_CONNTRACK_IPV4=m |
162 | CONFIG_NF_TABLES_IPV4=m | ||
163 | CONFIG_NFT_REJECT_IPV4=m | ||
164 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 168 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
165 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 169 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
166 | CONFIG_NF_TABLES_ARP=m | 170 | CONFIG_NF_TABLES_ARP=m |
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
186 | CONFIG_IP_NF_ARPFILTER=m | 190 | CONFIG_IP_NF_ARPFILTER=m |
187 | CONFIG_IP_NF_ARP_MANGLE=m | 191 | CONFIG_IP_NF_ARP_MANGLE=m |
188 | CONFIG_NF_CONNTRACK_IPV6=m | 192 | CONFIG_NF_CONNTRACK_IPV6=m |
189 | CONFIG_NF_TABLES_IPV6=m | ||
190 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 193 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
191 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 194 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
192 | CONFIG_IP6_NF_IPTABLES=m | 195 | CONFIG_IP6_NF_IPTABLES=m |
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
463 | CONFIG_CRYPTO_USER_API_HASH=m | 466 | CONFIG_CRYPTO_USER_API_HASH=m |
464 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 467 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
465 | # CONFIG_CRYPTO_HW is not set | 468 | # CONFIG_CRYPTO_HW is not set |
466 | CONFIG_CRC_T10DIF=y | ||
467 | CONFIG_XZ_DEC_X86=y | 469 | CONFIG_XZ_DEC_X86=y |
468 | CONFIG_XZ_DEC_POWERPC=y | 470 | CONFIG_XZ_DEC_POWERPC=y |
469 | CONFIG_XZ_DEC_IA64=y | 471 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 7cd9d9f456fb..8936d7fb0f0f 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y | |||
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
28 | CONFIG_KEXEC=y | ||
29 | CONFIG_BOOTINFO_PROC=y | ||
28 | CONFIG_M68020=y | 30 | CONFIG_M68020=y |
29 | CONFIG_M68030=y | 31 | CONFIG_M68030=y |
30 | CONFIG_M68040=y | 32 | CONFIG_M68040=y |
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
83 | CONFIG_NF_CONNTRACK_SIP=m | 85 | CONFIG_NF_CONNTRACK_SIP=m |
84 | CONFIG_NF_CONNTRACK_TFTP=m | 86 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NF_TABLES=m | 87 | CONFIG_NF_TABLES=m |
88 | CONFIG_NF_TABLES_INET=m | ||
86 | CONFIG_NFT_EXTHDR=m | 89 | CONFIG_NFT_EXTHDR=m |
87 | CONFIG_NFT_META=m | 90 | CONFIG_NFT_META=m |
88 | CONFIG_NFT_CT=m | 91 | CONFIG_NFT_CT=m |
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m | |||
92 | CONFIG_NFT_LOG=m | 95 | CONFIG_NFT_LOG=m |
93 | CONFIG_NFT_LIMIT=m | 96 | CONFIG_NFT_LIMIT=m |
94 | CONFIG_NFT_NAT=m | 97 | CONFIG_NFT_NAT=m |
98 | CONFIG_NFT_QUEUE=m | ||
99 | CONFIG_NFT_REJECT=m | ||
95 | CONFIG_NFT_COMPAT=m | 100 | CONFIG_NFT_COMPAT=m |
96 | CONFIG_NETFILTER_XT_SET=m | 101 | CONFIG_NETFILTER_XT_SET=m |
97 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 102 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
124 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 129 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
125 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 130 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
126 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 131 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
132 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
127 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 133 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
128 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 134 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
129 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 135 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
161 | CONFIG_IP_SET_HASH_NETIFACE=m | 167 | CONFIG_IP_SET_HASH_NETIFACE=m |
162 | CONFIG_IP_SET_LIST_SET=m | 168 | CONFIG_IP_SET_LIST_SET=m |
163 | CONFIG_NF_CONNTRACK_IPV4=m | 169 | CONFIG_NF_CONNTRACK_IPV4=m |
164 | CONFIG_NF_TABLES_IPV4=m | ||
165 | CONFIG_NFT_REJECT_IPV4=m | ||
166 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 170 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
167 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 171 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
168 | CONFIG_NF_TABLES_ARP=m | 172 | CONFIG_NF_TABLES_ARP=m |
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
188 | CONFIG_IP_NF_ARPFILTER=m | 192 | CONFIG_IP_NF_ARPFILTER=m |
189 | CONFIG_IP_NF_ARP_MANGLE=m | 193 | CONFIG_IP_NF_ARP_MANGLE=m |
190 | CONFIG_NF_CONNTRACK_IPV6=m | 194 | CONFIG_NF_CONNTRACK_IPV6=m |
191 | CONFIG_NF_TABLES_IPV6=m | ||
192 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 195 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
193 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 196 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
194 | CONFIG_IP6_NF_IPTABLES=m | 197 | CONFIG_IP6_NF_IPTABLES=m |
@@ -472,7 +475,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
472 | CONFIG_CRYPTO_USER_API_HASH=m | 475 | CONFIG_CRYPTO_USER_API_HASH=m |
473 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 476 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
474 | # CONFIG_CRYPTO_HW is not set | 477 | # CONFIG_CRYPTO_HW is not set |
475 | CONFIG_CRC_T10DIF=y | ||
476 | CONFIG_XZ_DEC_X86=y | 478 | CONFIG_XZ_DEC_X86=y |
477 | CONFIG_XZ_DEC_POWERPC=y | 479 | CONFIG_XZ_DEC_POWERPC=y |
478 | CONFIG_XZ_DEC_IA64=y | 480 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 31f5bd061d14..be5342cca25b 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y | |||
24 | # CONFIG_EFI_PARTITION is not set | 24 | # CONFIG_EFI_PARTITION is not set |
25 | CONFIG_SYSV68_PARTITION=y | 25 | CONFIG_SYSV68_PARTITION=y |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68020=y | 29 | CONFIG_M68020=y |
28 | CONFIG_M68030=y | 30 | CONFIG_M68030=y |
29 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
82 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
83 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
84 | CONFIG_NF_TABLES=m | 86 | CONFIG_NF_TABLES=m |
87 | CONFIG_NF_TABLES_INET=m | ||
85 | CONFIG_NFT_EXTHDR=m | 88 | CONFIG_NFT_EXTHDR=m |
86 | CONFIG_NFT_META=m | 89 | CONFIG_NFT_META=m |
87 | CONFIG_NFT_CT=m | 90 | CONFIG_NFT_CT=m |
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m | |||
91 | CONFIG_NFT_LOG=m | 94 | CONFIG_NFT_LOG=m |
92 | CONFIG_NFT_LIMIT=m | 95 | CONFIG_NFT_LIMIT=m |
93 | CONFIG_NFT_NAT=m | 96 | CONFIG_NFT_NAT=m |
97 | CONFIG_NFT_QUEUE=m | ||
98 | CONFIG_NFT_REJECT=m | ||
94 | CONFIG_NFT_COMPAT=m | 99 | CONFIG_NFT_COMPAT=m |
95 | CONFIG_NETFILTER_XT_SET=m | 100 | CONFIG_NETFILTER_XT_SET=m |
96 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 101 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
123 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 128 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
124 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 129 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
125 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 130 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
131 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
126 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 132 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
127 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 133 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
128 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 134 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
160 | CONFIG_IP_SET_HASH_NETIFACE=m | 166 | CONFIG_IP_SET_HASH_NETIFACE=m |
161 | CONFIG_IP_SET_LIST_SET=m | 167 | CONFIG_IP_SET_LIST_SET=m |
162 | CONFIG_NF_CONNTRACK_IPV4=m | 168 | CONFIG_NF_CONNTRACK_IPV4=m |
163 | CONFIG_NF_TABLES_IPV4=m | ||
164 | CONFIG_NFT_REJECT_IPV4=m | ||
165 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 169 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
166 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 170 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
167 | CONFIG_NF_TABLES_ARP=m | 171 | CONFIG_NF_TABLES_ARP=m |
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
187 | CONFIG_IP_NF_ARPFILTER=m | 191 | CONFIG_IP_NF_ARPFILTER=m |
188 | CONFIG_IP_NF_ARP_MANGLE=m | 192 | CONFIG_IP_NF_ARP_MANGLE=m |
189 | CONFIG_NF_CONNTRACK_IPV6=m | 193 | CONFIG_NF_CONNTRACK_IPV6=m |
190 | CONFIG_NF_TABLES_IPV6=m | ||
191 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 194 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
192 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 195 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
193 | CONFIG_IP6_NF_IPTABLES=m | 196 | CONFIG_IP6_NF_IPTABLES=m |
@@ -495,7 +498,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
495 | CONFIG_CRYPTO_USER_API_HASH=m | 498 | CONFIG_CRYPTO_USER_API_HASH=m |
496 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 499 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
497 | # CONFIG_CRYPTO_HW is not set | 500 | # CONFIG_CRYPTO_HW is not set |
498 | CONFIG_CRC_T10DIF=y | ||
499 | CONFIG_XZ_DEC_X86=y | 501 | CONFIG_XZ_DEC_X86=y |
500 | CONFIG_XZ_DEC_POWERPC=y | 502 | CONFIG_XZ_DEC_POWERPC=y |
501 | CONFIG_XZ_DEC_IA64=y | 503 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 4e5adff326ee..f27194ade167 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -20,6 +20,8 @@ CONFIG_SOLARIS_X86_PARTITION=y | |||
20 | CONFIG_UNIXWARE_DISKLABEL=y | 20 | CONFIG_UNIXWARE_DISKLABEL=y |
21 | # CONFIG_EFI_PARTITION is not set | 21 | # CONFIG_EFI_PARTITION is not set |
22 | CONFIG_IOSCHED_DEADLINE=m | 22 | CONFIG_IOSCHED_DEADLINE=m |
23 | CONFIG_KEXEC=y | ||
24 | CONFIG_BOOTINFO_PROC=y | ||
23 | CONFIG_M68020=y | 25 | CONFIG_M68020=y |
24 | CONFIG_M68040=y | 26 | CONFIG_M68040=y |
25 | CONFIG_M68060=y | 27 | CONFIG_M68060=y |
@@ -91,6 +93,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
91 | CONFIG_NF_CONNTRACK_SIP=m | 93 | CONFIG_NF_CONNTRACK_SIP=m |
92 | CONFIG_NF_CONNTRACK_TFTP=m | 94 | CONFIG_NF_CONNTRACK_TFTP=m |
93 | CONFIG_NF_TABLES=m | 95 | CONFIG_NF_TABLES=m |
96 | CONFIG_NF_TABLES_INET=m | ||
94 | CONFIG_NFT_EXTHDR=m | 97 | CONFIG_NFT_EXTHDR=m |
95 | CONFIG_NFT_META=m | 98 | CONFIG_NFT_META=m |
96 | CONFIG_NFT_CT=m | 99 | CONFIG_NFT_CT=m |
@@ -100,6 +103,8 @@ CONFIG_NFT_COUNTER=m | |||
100 | CONFIG_NFT_LOG=m | 103 | CONFIG_NFT_LOG=m |
101 | CONFIG_NFT_LIMIT=m | 104 | CONFIG_NFT_LIMIT=m |
102 | CONFIG_NFT_NAT=m | 105 | CONFIG_NFT_NAT=m |
106 | CONFIG_NFT_QUEUE=m | ||
107 | CONFIG_NFT_REJECT=m | ||
103 | CONFIG_NFT_COMPAT=m | 108 | CONFIG_NFT_COMPAT=m |
104 | CONFIG_NETFILTER_XT_SET=m | 109 | CONFIG_NETFILTER_XT_SET=m |
105 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -132,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
132 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 137 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
133 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 138 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
134 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 139 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
140 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
135 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 141 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
136 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 142 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
137 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 143 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -169,8 +175,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
169 | CONFIG_IP_SET_HASH_NETIFACE=m | 175 | CONFIG_IP_SET_HASH_NETIFACE=m |
170 | CONFIG_IP_SET_LIST_SET=m | 176 | CONFIG_IP_SET_LIST_SET=m |
171 | CONFIG_NF_CONNTRACK_IPV4=m | 177 | CONFIG_NF_CONNTRACK_IPV4=m |
172 | CONFIG_NF_TABLES_IPV4=m | ||
173 | CONFIG_NFT_REJECT_IPV4=m | ||
174 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 178 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
175 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 179 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
176 | CONFIG_NF_TABLES_ARP=m | 180 | CONFIG_NF_TABLES_ARP=m |
@@ -196,7 +200,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
196 | CONFIG_IP_NF_ARPFILTER=m | 200 | CONFIG_IP_NF_ARPFILTER=m |
197 | CONFIG_IP_NF_ARP_MANGLE=m | 201 | CONFIG_IP_NF_ARP_MANGLE=m |
198 | CONFIG_NF_CONNTRACK_IPV6=m | 202 | CONFIG_NF_CONNTRACK_IPV6=m |
199 | CONFIG_NF_TABLES_IPV6=m | ||
200 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 203 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
201 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 204 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
202 | CONFIG_IP6_NF_IPTABLES=m | 205 | CONFIG_IP6_NF_IPTABLES=m |
@@ -571,7 +574,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
571 | CONFIG_CRYPTO_USER_API_HASH=m | 574 | CONFIG_CRYPTO_USER_API_HASH=m |
572 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 575 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
573 | # CONFIG_CRYPTO_HW is not set | 576 | # CONFIG_CRYPTO_HW is not set |
574 | CONFIG_CRC_T10DIF=y | ||
575 | CONFIG_XZ_DEC_X86=y | 577 | CONFIG_XZ_DEC_X86=y |
576 | CONFIG_XZ_DEC_POWERPC=y | 578 | CONFIG_XZ_DEC_POWERPC=y |
577 | CONFIG_XZ_DEC_IA64=y | 579 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 02cdbac5565e..c3887603c1db 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
24 | CONFIG_SUN_PARTITION=y | 24 | CONFIG_SUN_PARTITION=y |
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68030=y | 29 | CONFIG_M68030=y |
28 | CONFIG_VME=y | 30 | CONFIG_VME=y |
29 | CONFIG_MVME147=y | 31 | CONFIG_MVME147=y |
@@ -80,6 +82,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
80 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
81 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
82 | CONFIG_NF_TABLES=m | 84 | CONFIG_NF_TABLES=m |
85 | CONFIG_NF_TABLES_INET=m | ||
83 | CONFIG_NFT_EXTHDR=m | 86 | CONFIG_NFT_EXTHDR=m |
84 | CONFIG_NFT_META=m | 87 | CONFIG_NFT_META=m |
85 | CONFIG_NFT_CT=m | 88 | CONFIG_NFT_CT=m |
@@ -89,6 +92,8 @@ CONFIG_NFT_COUNTER=m | |||
89 | CONFIG_NFT_LOG=m | 92 | CONFIG_NFT_LOG=m |
90 | CONFIG_NFT_LIMIT=m | 93 | CONFIG_NFT_LIMIT=m |
91 | CONFIG_NFT_NAT=m | 94 | CONFIG_NFT_NAT=m |
95 | CONFIG_NFT_QUEUE=m | ||
96 | CONFIG_NFT_REJECT=m | ||
92 | CONFIG_NFT_COMPAT=m | 97 | CONFIG_NFT_COMPAT=m |
93 | CONFIG_NETFILTER_XT_SET=m | 98 | CONFIG_NETFILTER_XT_SET=m |
94 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 99 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -121,6 +126,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
121 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 126 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
122 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 127 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
123 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 128 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
129 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
124 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 130 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
125 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 131 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
126 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 132 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -158,8 +164,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
158 | CONFIG_IP_SET_HASH_NETIFACE=m | 164 | CONFIG_IP_SET_HASH_NETIFACE=m |
159 | CONFIG_IP_SET_LIST_SET=m | 165 | CONFIG_IP_SET_LIST_SET=m |
160 | CONFIG_NF_CONNTRACK_IPV4=m | 166 | CONFIG_NF_CONNTRACK_IPV4=m |
161 | CONFIG_NF_TABLES_IPV4=m | ||
162 | CONFIG_NFT_REJECT_IPV4=m | ||
163 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 167 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
164 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 168 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
165 | CONFIG_NF_TABLES_ARP=m | 169 | CONFIG_NF_TABLES_ARP=m |
@@ -185,7 +189,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
185 | CONFIG_IP_NF_ARPFILTER=m | 189 | CONFIG_IP_NF_ARPFILTER=m |
186 | CONFIG_IP_NF_ARP_MANGLE=m | 190 | CONFIG_IP_NF_ARP_MANGLE=m |
187 | CONFIG_NF_CONNTRACK_IPV6=m | 191 | CONFIG_NF_CONNTRACK_IPV6=m |
188 | CONFIG_NF_TABLES_IPV6=m | ||
189 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 192 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
190 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 193 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
191 | CONFIG_IP6_NF_IPTABLES=m | 194 | CONFIG_IP6_NF_IPTABLES=m |
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
463 | CONFIG_CRYPTO_USER_API_HASH=m | 466 | CONFIG_CRYPTO_USER_API_HASH=m |
464 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 467 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
465 | # CONFIG_CRYPTO_HW is not set | 468 | # CONFIG_CRYPTO_HW is not set |
466 | CONFIG_CRC_T10DIF=y | ||
467 | CONFIG_XZ_DEC_X86=y | 469 | CONFIG_XZ_DEC_X86=y |
468 | CONFIG_XZ_DEC_POWERPC=y | 470 | CONFIG_XZ_DEC_POWERPC=y |
469 | CONFIG_XZ_DEC_IA64=y | 471 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 05a990a9dbd4..f7ff784d05ac 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
24 | CONFIG_SUN_PARTITION=y | 24 | CONFIG_SUN_PARTITION=y |
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
28 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
29 | CONFIG_VME=y | 31 | CONFIG_VME=y |
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
81 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
82 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
83 | CONFIG_NF_TABLES=m | 85 | CONFIG_NF_TABLES=m |
86 | CONFIG_NF_TABLES_INET=m | ||
84 | CONFIG_NFT_EXTHDR=m | 87 | CONFIG_NFT_EXTHDR=m |
85 | CONFIG_NFT_META=m | 88 | CONFIG_NFT_META=m |
86 | CONFIG_NFT_CT=m | 89 | CONFIG_NFT_CT=m |
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m | |||
90 | CONFIG_NFT_LOG=m | 93 | CONFIG_NFT_LOG=m |
91 | CONFIG_NFT_LIMIT=m | 94 | CONFIG_NFT_LIMIT=m |
92 | CONFIG_NFT_NAT=m | 95 | CONFIG_NFT_NAT=m |
96 | CONFIG_NFT_QUEUE=m | ||
97 | CONFIG_NFT_REJECT=m | ||
93 | CONFIG_NFT_COMPAT=m | 98 | CONFIG_NFT_COMPAT=m |
94 | CONFIG_NETFILTER_XT_SET=m | 99 | CONFIG_NETFILTER_XT_SET=m |
95 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 100 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
122 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 127 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
123 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 128 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
124 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 129 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
130 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
125 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 131 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
126 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 132 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
127 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 133 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
159 | CONFIG_IP_SET_HASH_NETIFACE=m | 165 | CONFIG_IP_SET_HASH_NETIFACE=m |
160 | CONFIG_IP_SET_LIST_SET=m | 166 | CONFIG_IP_SET_LIST_SET=m |
161 | CONFIG_NF_CONNTRACK_IPV4=m | 167 | CONFIG_NF_CONNTRACK_IPV4=m |
162 | CONFIG_NF_TABLES_IPV4=m | ||
163 | CONFIG_NFT_REJECT_IPV4=m | ||
164 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 168 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
165 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 169 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
166 | CONFIG_NF_TABLES_ARP=m | 170 | CONFIG_NF_TABLES_ARP=m |
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
186 | CONFIG_IP_NF_ARPFILTER=m | 190 | CONFIG_IP_NF_ARPFILTER=m |
187 | CONFIG_IP_NF_ARP_MANGLE=m | 191 | CONFIG_IP_NF_ARP_MANGLE=m |
188 | CONFIG_NF_CONNTRACK_IPV6=m | 192 | CONFIG_NF_CONNTRACK_IPV6=m |
189 | CONFIG_NF_TABLES_IPV6=m | ||
190 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 193 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
191 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 194 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
192 | CONFIG_IP6_NF_IPTABLES=m | 195 | CONFIG_IP6_NF_IPTABLES=m |
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
464 | CONFIG_CRYPTO_USER_API_HASH=m | 467 | CONFIG_CRYPTO_USER_API_HASH=m |
465 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 468 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
466 | # CONFIG_CRYPTO_HW is not set | 469 | # CONFIG_CRYPTO_HW is not set |
467 | CONFIG_CRC_T10DIF=y | ||
468 | CONFIG_XZ_DEC_X86=y | 470 | CONFIG_XZ_DEC_X86=y |
469 | CONFIG_XZ_DEC_POWERPC=y | 471 | CONFIG_XZ_DEC_POWERPC=y |
470 | CONFIG_XZ_DEC_IA64=y | 472 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 568e2a98f976..f0c72ab037be 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y | |||
25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
28 | CONFIG_KEXEC=y | ||
29 | CONFIG_BOOTINFO_PROC=y | ||
28 | CONFIG_M68040=y | 30 | CONFIG_M68040=y |
29 | CONFIG_M68060=y | 31 | CONFIG_M68060=y |
30 | CONFIG_Q40=y | 32 | CONFIG_Q40=y |
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
81 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
82 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
83 | CONFIG_NF_TABLES=m | 85 | CONFIG_NF_TABLES=m |
86 | CONFIG_NF_TABLES_INET=m | ||
84 | CONFIG_NFT_EXTHDR=m | 87 | CONFIG_NFT_EXTHDR=m |
85 | CONFIG_NFT_META=m | 88 | CONFIG_NFT_META=m |
86 | CONFIG_NFT_CT=m | 89 | CONFIG_NFT_CT=m |
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m | |||
90 | CONFIG_NFT_LOG=m | 93 | CONFIG_NFT_LOG=m |
91 | CONFIG_NFT_LIMIT=m | 94 | CONFIG_NFT_LIMIT=m |
92 | CONFIG_NFT_NAT=m | 95 | CONFIG_NFT_NAT=m |
96 | CONFIG_NFT_QUEUE=m | ||
97 | CONFIG_NFT_REJECT=m | ||
93 | CONFIG_NFT_COMPAT=m | 98 | CONFIG_NFT_COMPAT=m |
94 | CONFIG_NETFILTER_XT_SET=m | 99 | CONFIG_NETFILTER_XT_SET=m |
95 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 100 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
122 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 127 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
123 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 128 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
124 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 129 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
130 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
125 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 131 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
126 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 132 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
127 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 133 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
159 | CONFIG_IP_SET_HASH_NETIFACE=m | 165 | CONFIG_IP_SET_HASH_NETIFACE=m |
160 | CONFIG_IP_SET_LIST_SET=m | 166 | CONFIG_IP_SET_LIST_SET=m |
161 | CONFIG_NF_CONNTRACK_IPV4=m | 167 | CONFIG_NF_CONNTRACK_IPV4=m |
162 | CONFIG_NF_TABLES_IPV4=m | ||
163 | CONFIG_NFT_REJECT_IPV4=m | ||
164 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 168 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
165 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 169 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
166 | CONFIG_NF_TABLES_ARP=m | 170 | CONFIG_NF_TABLES_ARP=m |
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
186 | CONFIG_IP_NF_ARPFILTER=m | 190 | CONFIG_IP_NF_ARPFILTER=m |
187 | CONFIG_IP_NF_ARP_MANGLE=m | 191 | CONFIG_IP_NF_ARP_MANGLE=m |
188 | CONFIG_NF_CONNTRACK_IPV6=m | 192 | CONFIG_NF_CONNTRACK_IPV6=m |
189 | CONFIG_NF_TABLES_IPV6=m | ||
190 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 193 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
191 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 194 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
192 | CONFIG_IP6_NF_IPTABLES=m | 195 | CONFIG_IP6_NF_IPTABLES=m |
@@ -485,7 +488,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
485 | CONFIG_CRYPTO_USER_API_HASH=m | 488 | CONFIG_CRYPTO_USER_API_HASH=m |
486 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 489 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
487 | # CONFIG_CRYPTO_HW is not set | 490 | # CONFIG_CRYPTO_HW is not set |
488 | CONFIG_CRC_T10DIF=y | ||
489 | CONFIG_XZ_DEC_X86=y | 491 | CONFIG_XZ_DEC_X86=y |
490 | CONFIG_XZ_DEC_POWERPC=y | 492 | CONFIG_XZ_DEC_POWERPC=y |
491 | CONFIG_XZ_DEC_IA64=y | 493 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 60b0aeac5742..7bca0f464521 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
24 | # CONFIG_EFI_PARTITION is not set | 24 | # CONFIG_EFI_PARTITION is not set |
25 | CONFIG_SYSV68_PARTITION=y | 25 | CONFIG_SYSV68_PARTITION=y |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_SUN3=y | 29 | CONFIG_SUN3=y |
28 | # CONFIG_COMPACTION is not set | 30 | # CONFIG_COMPACTION is not set |
29 | CONFIG_CLEANCACHE=y | 31 | CONFIG_CLEANCACHE=y |
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
78 | CONFIG_NF_CONNTRACK_SIP=m | 80 | CONFIG_NF_CONNTRACK_SIP=m |
79 | CONFIG_NF_CONNTRACK_TFTP=m | 81 | CONFIG_NF_CONNTRACK_TFTP=m |
80 | CONFIG_NF_TABLES=m | 82 | CONFIG_NF_TABLES=m |
83 | CONFIG_NF_TABLES_INET=m | ||
81 | CONFIG_NFT_EXTHDR=m | 84 | CONFIG_NFT_EXTHDR=m |
82 | CONFIG_NFT_META=m | 85 | CONFIG_NFT_META=m |
83 | CONFIG_NFT_CT=m | 86 | CONFIG_NFT_CT=m |
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m | |||
87 | CONFIG_NFT_LOG=m | 90 | CONFIG_NFT_LOG=m |
88 | CONFIG_NFT_LIMIT=m | 91 | CONFIG_NFT_LIMIT=m |
89 | CONFIG_NFT_NAT=m | 92 | CONFIG_NFT_NAT=m |
93 | CONFIG_NFT_QUEUE=m | ||
94 | CONFIG_NFT_REJECT=m | ||
90 | CONFIG_NFT_COMPAT=m | 95 | CONFIG_NFT_COMPAT=m |
91 | CONFIG_NETFILTER_XT_SET=m | 96 | CONFIG_NETFILTER_XT_SET=m |
92 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 97 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
119 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 124 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
120 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 125 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
121 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 126 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
127 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
122 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 128 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
123 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 129 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
124 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 130 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
156 | CONFIG_IP_SET_HASH_NETIFACE=m | 162 | CONFIG_IP_SET_HASH_NETIFACE=m |
157 | CONFIG_IP_SET_LIST_SET=m | 163 | CONFIG_IP_SET_LIST_SET=m |
158 | CONFIG_NF_CONNTRACK_IPV4=m | 164 | CONFIG_NF_CONNTRACK_IPV4=m |
159 | CONFIG_NF_TABLES_IPV4=m | ||
160 | CONFIG_NFT_REJECT_IPV4=m | ||
161 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 165 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
162 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 166 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
163 | CONFIG_NF_TABLES_ARP=m | 167 | CONFIG_NF_TABLES_ARP=m |
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
183 | CONFIG_IP_NF_ARPFILTER=m | 187 | CONFIG_IP_NF_ARPFILTER=m |
184 | CONFIG_IP_NF_ARP_MANGLE=m | 188 | CONFIG_IP_NF_ARP_MANGLE=m |
185 | CONFIG_NF_CONNTRACK_IPV6=m | 189 | CONFIG_NF_CONNTRACK_IPV6=m |
186 | CONFIG_NF_TABLES_IPV6=m | ||
187 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 190 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
188 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 191 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
189 | CONFIG_IP6_NF_IPTABLES=m | 192 | CONFIG_IP6_NF_IPTABLES=m |
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
464 | CONFIG_CRYPTO_USER_API_HASH=m | 467 | CONFIG_CRYPTO_USER_API_HASH=m |
465 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 468 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
466 | # CONFIG_CRYPTO_HW is not set | 469 | # CONFIG_CRYPTO_HW is not set |
467 | CONFIG_CRC_T10DIF=y | ||
468 | CONFIG_XZ_DEC_X86=y | 470 | CONFIG_XZ_DEC_X86=y |
469 | CONFIG_XZ_DEC_POWERPC=y | 471 | CONFIG_XZ_DEC_POWERPC=y |
470 | CONFIG_XZ_DEC_IA64=y | 472 | CONFIG_XZ_DEC_IA64=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 21bda331eebb..317f3e1fec95 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
24 | # CONFIG_EFI_PARTITION is not set | 24 | # CONFIG_EFI_PARTITION is not set |
25 | CONFIG_SYSV68_PARTITION=y | 25 | CONFIG_SYSV68_PARTITION=y |
26 | CONFIG_IOSCHED_DEADLINE=m | 26 | CONFIG_IOSCHED_DEADLINE=m |
27 | CONFIG_KEXEC=y | ||
28 | CONFIG_BOOTINFO_PROC=y | ||
27 | CONFIG_SUN3X=y | 29 | CONFIG_SUN3X=y |
28 | # CONFIG_COMPACTION is not set | 30 | # CONFIG_COMPACTION is not set |
29 | CONFIG_CLEANCACHE=y | 31 | CONFIG_CLEANCACHE=y |
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
78 | CONFIG_NF_CONNTRACK_SIP=m | 80 | CONFIG_NF_CONNTRACK_SIP=m |
79 | CONFIG_NF_CONNTRACK_TFTP=m | 81 | CONFIG_NF_CONNTRACK_TFTP=m |
80 | CONFIG_NF_TABLES=m | 82 | CONFIG_NF_TABLES=m |
83 | CONFIG_NF_TABLES_INET=m | ||
81 | CONFIG_NFT_EXTHDR=m | 84 | CONFIG_NFT_EXTHDR=m |
82 | CONFIG_NFT_META=m | 85 | CONFIG_NFT_META=m |
83 | CONFIG_NFT_CT=m | 86 | CONFIG_NFT_CT=m |
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m | |||
87 | CONFIG_NFT_LOG=m | 90 | CONFIG_NFT_LOG=m |
88 | CONFIG_NFT_LIMIT=m | 91 | CONFIG_NFT_LIMIT=m |
89 | CONFIG_NFT_NAT=m | 92 | CONFIG_NFT_NAT=m |
93 | CONFIG_NFT_QUEUE=m | ||
94 | CONFIG_NFT_REJECT=m | ||
90 | CONFIG_NFT_COMPAT=m | 95 | CONFIG_NFT_COMPAT=m |
91 | CONFIG_NETFILTER_XT_SET=m | 96 | CONFIG_NETFILTER_XT_SET=m |
92 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 97 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
119 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 124 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
120 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 125 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
121 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 126 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
127 | CONFIG_NETFILTER_XT_MATCH_IPCOMP=m | ||
122 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 128 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
123 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 129 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
124 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 130 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
156 | CONFIG_IP_SET_HASH_NETIFACE=m | 162 | CONFIG_IP_SET_HASH_NETIFACE=m |
157 | CONFIG_IP_SET_LIST_SET=m | 163 | CONFIG_IP_SET_LIST_SET=m |
158 | CONFIG_NF_CONNTRACK_IPV4=m | 164 | CONFIG_NF_CONNTRACK_IPV4=m |
159 | CONFIG_NF_TABLES_IPV4=m | ||
160 | CONFIG_NFT_REJECT_IPV4=m | ||
161 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 165 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
162 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 166 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
163 | CONFIG_NF_TABLES_ARP=m | 167 | CONFIG_NF_TABLES_ARP=m |
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
183 | CONFIG_IP_NF_ARPFILTER=m | 187 | CONFIG_IP_NF_ARPFILTER=m |
184 | CONFIG_IP_NF_ARP_MANGLE=m | 188 | CONFIG_IP_NF_ARP_MANGLE=m |
185 | CONFIG_NF_CONNTRACK_IPV6=m | 189 | CONFIG_NF_CONNTRACK_IPV6=m |
186 | CONFIG_NF_TABLES_IPV6=m | ||
187 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 190 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
188 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 191 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
189 | CONFIG_IP6_NF_IPTABLES=m | 192 | CONFIG_IP6_NF_IPTABLES=m |
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m | |||
464 | CONFIG_CRYPTO_USER_API_HASH=m | 467 | CONFIG_CRYPTO_USER_API_HASH=m |
465 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 468 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
466 | # CONFIG_CRYPTO_HW is not set | 469 | # CONFIG_CRYPTO_HW is not set |
467 | CONFIG_CRC_T10DIF=y | ||
468 | CONFIG_XZ_DEC_X86=y | 470 | CONFIG_XZ_DEC_X86=y |
469 | CONFIG_XZ_DEC_POWERPC=y | 471 | CONFIG_XZ_DEC_POWERPC=y |
470 | CONFIG_XZ_DEC_IA64=y | 472 | CONFIG_XZ_DEC_IA64=y |