Commit 65a16016 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v6.2-rc3 



  - Drop CONFIG_NFT_OBJREF=m (removed in commit d037abc2
    ("netfilter: nft_objref: make it builtin")),
  - Drop CONFIG_TEST_STRSCPY=m (replaced by auto-modular
    CONFIG_STRSCPY_KUNIT_TEST in commit 41eefc46 ("string:
    Convert strscpy() self-test to KUnit")),
  - Drop CONFIG_TEST_SIPHASH=m (replaced by auto-modular
    CONFIG_SIPHASH_KUNIT_TEST in commit fb3d88ab ("siphash:
    Convert selftest to KUnit")).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/fdd3b827ebc5abea6c295df4121048a6a03b698a.1672654705.git.geert@linux-m68k.org
Link: https://lore.kernel.org/r/6c4589bc56ffba0f923a7361262397f6c32a3dc1.1673255008.git.geert@linux-m68k.org
parent 40202cca

arch/m68k/configs/amiga_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ 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

CONFIG_NFT_REJECT=m
@@ -630,7 +629,6 @@ CONFIG_ASYNC_RAID6_TEST=m 
CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m
@@ -638,7 +636,6 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/apollo_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 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

CONFIG_NFT_REJECT=m
@@ -586,7 +585,6 @@ CONFIG_ASYNC_RAID6_TEST=m 
CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m
@@ -594,7 +592,6 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/atari_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 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

CONFIG_NFT_REJECT=m
@@ -607,7 +606,6 @@ CONFIG_ASYNC_RAID6_TEST=m 
CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m
@@ -615,7 +613,6 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/bvme6000_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ 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

CONFIG_NFT_REJECT=m
@@ -578,7 +577,6 @@ CONFIG_ASYNC_RAID6_TEST=m 
CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m
@@ -586,7 +584,6 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/hp300_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 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

CONFIG_NFT_REJECT=m
@@ -588,7 +587,6 @@ CONFIG_ASYNC_RAID6_TEST=m 
CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m
@@ -596,7 +594,6 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m