Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

m68k: Update defconfigs for v3.14-rc1

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Geert Uytterhoeven 11 years ago
parent
eff9cf8d6e
commit
50be9eba83
12 changed files with 72 additions and 48 deletions
Split View Show Diff Stats
  1. 6 4
      arch/m68k/configs/amiga_defconfig
  2. 6 4
      arch/m68k/configs/apollo_defconfig
  3. 6 4
      arch/m68k/configs/atari_defconfig
  4. 6 4
      arch/m68k/configs/bvme6000_defconfig
  5. 6 4
      arch/m68k/configs/hp300_defconfig
  6. 6 4
      arch/m68k/configs/mac_defconfig
  7. 6 4
      arch/m68k/configs/multi_defconfig
  8. 6 4
      arch/m68k/configs/mvme147_defconfig
  9. 6 4
      arch/m68k/configs/mvme16x_defconfig
  10. 6 4
      arch/m68k/configs/q40_defconfig
  11. 6 4
      arch/m68k/configs/sun3_defconfig
  12. 6 4
      arch/m68k/configs/sun3x_defconfig

+ 6 - 4
arch/m68k/configs/amiga_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -85,6 +87,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -94,6 +97,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -126,6 +131,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -163,8 +169,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -190,7 +194,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -512,7 +515,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/apollo_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -470,7 +473,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/atari_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -487,7 +490,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/bvme6000_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_VME=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/hp300_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -472,7 +475,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mac_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -495,7 +498,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/multi_defconfig
View File 

@@ -20,6 +20,8 @@ CONFIG_SOLARIS_X86_PARTITION=y
 
 CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
@@ -91,6 +93,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -100,6 +103,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -132,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -169,8 +175,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -196,7 +200,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -571,7 +574,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mvme147_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68030=y
 
 CONFIG_VME=y
 
 CONFIG_MVME147=y
 
@@ -80,6 +82,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -89,6 +92,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -121,6 +126,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -158,8 +164,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -185,7 +189,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mvme16x_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_VME=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/q40_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_Q40=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -485,7 +488,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/sun3_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_SUN3=y
 
 # CONFIG_COMPACTION is not set
 
 CONFIG_CLEANCACHE=y
 
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/sun3x_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_SUN3X=y
 
 # CONFIG_COMPACTION is not set
 
 CONFIG_CLEANCACHE=y
 
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y