Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0783bb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v4.21-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - Generate syscall headers

 - Small improvements and cleanups

 - defconfig updates

* tag 'm68k-for-v4.21-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Generate uapi header and syscall table header files
  m68k: Add system call table generation support
  m68k: Add __NR_syscalls along with NR_syscalls
  m68k/defconfig: Update defconfigs for v4.20-rc1
  m68k: Remove redundant 'default n' from Kconfig
  m68k: Unroll raw_outsb() loop
parents 5694cecd 005e13a9

arch/m68k/Kconfig.machine

+0 −2
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ config UBOOT 
	help

	  If you say Y here kernel will try to collect command

	  line parameters from the initial u-boot stack.

	default n



config 4KSTACKS

	bool "Use 4Kb for kernel stacks instead of 8Kb"
@@ -395,7 +394,6 @@ comment "ROM configuration" 


config ROM

	bool "Specify ROM linker regions"

	default n

	help

	  Define a ROM region for the linker script. This creates a kernel

	  that can be stored in flash, with possibly the text, and data

arch/m68k/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -154,5 +154,8 @@ endif 
archclean:

	rm -f vmlinux.gz vmlinux.bz2



archheaders:

	$(Q)$(MAKE) $(build)=arch/m68k/kernel/syscalls all



install:

	sh $(srctree)/arch/m68k/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"

arch/m68k/configs/amiga_defconfig

+56 −47
Original line number Diff line number Diff line
@@ -12,6 +12,20 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_AMIGA=y

CONFIG_ZORRO=y

CONFIG_AMIGA_PCMCIA=y

CONFIG_ZORRO_NAMES=y

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_SERIAL_CONSOLE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -28,22 +42,12 @@ CONFIG_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_AMIGA=y

CONFIG_ZORRO=y

CONFIG_AMIGA_PCMCIA=y

CONFIG_ZORRO_NAMES=y

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -112,6 +116,7 @@ CONFIG_NFT_LIMIT=m 
CONFIG_NFT_MASQ=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_TUNNEL=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m
@@ -119,7 +124,10 @@ CONFIG_NFT_REJECT=m 
CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_FIB_INET=m

CONFIG_NFT_XFRM=m

CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -197,7 +205,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m
@@ -227,7 +234,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m
@@ -297,7 +303,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m
@@ -337,6 +342,7 @@ CONFIG_BLK_DEV_GAYLE=y 
CONFIG_BLK_DEV_BUDDHA=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -400,8 +406,10 @@ CONFIG_A2065=y 
CONFIG_ARIADNE=y

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set
@@ -487,10 +495,6 @@ CONFIG_RTC_DRV_RP5C01=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_SERIAL_CONSOLE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -588,31 +592,6 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m
@@ -630,6 +609,7 @@ CONFIG_CRYPTO_MORUS640=m 
CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m
@@ -639,7 +619,6 @@ CONFIG_CRYPTO_RMD128=m 
CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m
@@ -672,5 +651,35 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_BITFIELD=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/apollo_defconfig

+51 −42
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_APOLLO=y

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -29,19 +38,12 @@ CONFIG_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_APOLLO=y

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -110,6 +112,7 @@ CONFIG_NFT_LIMIT=m 
CONFIG_NFT_MASQ=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_TUNNEL=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m
@@ -117,7 +120,10 @@ CONFIG_NFT_REJECT=m 
CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_FIB_INET=m

CONFIG_NFT_XFRM=m

CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -195,7 +201,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m
@@ -225,7 +230,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m
@@ -295,7 +299,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m
@@ -324,6 +327,7 @@ CONFIG_ATA_OVER_ETH=m 
CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -378,8 +382,10 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -446,8 +452,6 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -545,31 +549,6 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m
@@ -587,6 +566,7 @@ CONFIG_CRYPTO_MORUS640=m 
CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m
@@ -596,7 +576,6 @@ CONFIG_CRYPTO_RMD128=m 
CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m
@@ -629,5 +608,35 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_BITFIELD=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/atari_defconfig

+59 −50
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_ATARI=y

CONFIG_ATARI_ROM_ISA=y

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_NATFEAT=y

CONFIG_NFBLOCK=y

CONFIG_NFCON=y

CONFIG_NFETH=y

CONFIG_ATARI_ETHERNAT=y

CONFIG_ATARI_ETHERNEC=y

CONFIG_ATARI_DSP56K=m

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -28,20 +45,12 @@ CONFIG_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y

CONFIG_M68030=y

CONFIG_M68040=y

CONFIG_M68060=y

CONFIG_ATARI=y

CONFIG_ATARI_ROM_ISA=y

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_CLEANCACHE=y

CONFIG_ZPOOL=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -110,6 +119,7 @@ CONFIG_NFT_LIMIT=m 
CONFIG_NFT_MASQ=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_TUNNEL=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m
@@ -117,7 +127,10 @@ CONFIG_NFT_REJECT=m 
CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_FIB_INET=m

CONFIG_NFT_XFRM=m

CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -195,7 +208,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m
@@ -225,7 +237,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m
@@ -295,7 +306,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m
@@ -332,6 +342,7 @@ CONFIG_BLK_DEV_IDECD=y 
CONFIG_BLK_DEV_FALCON_IDE=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -388,8 +399,10 @@ CONFIG_VETH=m 
CONFIG_ATARILANCE=y

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -460,15 +473,6 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_NATFEAT=y

CONFIG_NFBLOCK=y

CONFIG_NFCON=y

CONFIG_NFETH=y

CONFIG_ATARI_ETHERNAT=y

CONFIG_ATARI_ETHERNEC=y

CONFIG_ATARI_DSP56K=m

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -566,31 +570,6 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m
@@ -608,6 +587,7 @@ CONFIG_CRYPTO_MORUS640=m 
CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m
@@ -617,7 +597,6 @@ CONFIG_CRYPTO_RMD128=m 
CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m
@@ -650,5 +629,35 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_BITFIELD=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_EARLY_PRINTK=y