Skip to content

Commit 65a1601

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v6.2-rc3
 - Drop CONFIG_NFT_OBJREF=m (removed in commit d037abc ("netfilter: nft_objref: make it builtin")), - Drop CONFIG_TEST_STRSCPY=m (replaced by auto-modular CONFIG_STRSCPY_KUNIT_TEST in commit 41eefc4 ("string: Convert strscpy() self-test to KUnit")), - Drop CONFIG_TEST_SIPHASH=m (replaced by auto-modular CONFIG_SIPHASH_KUNIT_TEST in commit fb3d88a ("siphash: Convert selftest to KUnit")). Signed-off-by: Geert 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
1 parent 40202cc commit 65a1601

12 files changed

Lines changed: 1 addition & 36 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ CONFIG_NFT_MASQ=m
108108
CONFIG_NFT_REDIR=m
109109
CONFIG_NFT_NAT=m
110110
CONFIG_NFT_TUNNEL=m
111-
CONFIG_NFT_OBJREF=m
112111
CONFIG_NFT_QUEUE=m
113112
CONFIG_NFT_QUOTA=m
114113
CONFIG_NFT_REJECT=m
@@ -630,15 +629,13 @@ CONFIG_ASYNC_RAID6_TEST=m
630629
CONFIG_TEST_HEXDUMP=m
631630
CONFIG_STRING_SELFTEST=m
632631
CONFIG_TEST_STRING_HELPERS=m
633-
CONFIG_TEST_STRSCPY=m
634632
CONFIG_TEST_KSTRTOX=m
635633
CONFIG_TEST_PRINTF=m
636634
CONFIG_TEST_SCANF=m
637635
CONFIG_TEST_BITMAP=m
638636
CONFIG_TEST_UUID=m
639637
CONFIG_TEST_XARRAY=m
640638
CONFIG_TEST_RHASHTABLE=m
641-
CONFIG_TEST_SIPHASH=m
642639
CONFIG_TEST_IDA=m
643640
CONFIG_TEST_BITOPS=m
644641
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ CONFIG_NFT_MASQ=m
104104
CONFIG_NFT_REDIR=m
105105
CONFIG_NFT_NAT=m
106106
CONFIG_NFT_TUNNEL=m
107-
CONFIG_NFT_OBJREF=m
108107
CONFIG_NFT_QUEUE=m
109108
CONFIG_NFT_QUOTA=m
110109
CONFIG_NFT_REJECT=m
@@ -586,15 +585,13 @@ CONFIG_ASYNC_RAID6_TEST=m
586585
CONFIG_TEST_HEXDUMP=m
587586
CONFIG_STRING_SELFTEST=m
588587
CONFIG_TEST_STRING_HELPERS=m
589-
CONFIG_TEST_STRSCPY=m
590588
CONFIG_TEST_KSTRTOX=m
591589
CONFIG_TEST_PRINTF=m
592590
CONFIG_TEST_SCANF=m
593591
CONFIG_TEST_BITMAP=m
594592
CONFIG_TEST_UUID=m
595593
CONFIG_TEST_XARRAY=m
596594
CONFIG_TEST_RHASHTABLE=m
597-
CONFIG_TEST_SIPHASH=m
598595
CONFIG_TEST_IDA=m
599596
CONFIG_TEST_BITOPS=m
600597
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ CONFIG_NFT_MASQ=m
111111
CONFIG_NFT_REDIR=m
112112
CONFIG_NFT_NAT=m
113113
CONFIG_NFT_TUNNEL=m
114-
CONFIG_NFT_OBJREF=m
115114
CONFIG_NFT_QUEUE=m
116115
CONFIG_NFT_QUOTA=m
117116
CONFIG_NFT_REJECT=m
@@ -607,15 +606,13 @@ CONFIG_ASYNC_RAID6_TEST=m
607606
CONFIG_TEST_HEXDUMP=m
608607
CONFIG_STRING_SELFTEST=m
609608
CONFIG_TEST_STRING_HELPERS=m
610-
CONFIG_TEST_STRSCPY=m
611609
CONFIG_TEST_KSTRTOX=m
612610
CONFIG_TEST_PRINTF=m
613611
CONFIG_TEST_SCANF=m
614612
CONFIG_TEST_BITMAP=m
615613
CONFIG_TEST_UUID=m
616614
CONFIG_TEST_XARRAY=m
617615
CONFIG_TEST_RHASHTABLE=m
618-
CONFIG_TEST_SIPHASH=m
619616
CONFIG_TEST_IDA=m
620617
CONFIG_TEST_BITOPS=m
621618
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ CONFIG_NFT_MASQ=m
101101
CONFIG_NFT_REDIR=m
102102
CONFIG_NFT_NAT=m
103103
CONFIG_NFT_TUNNEL=m
104-
CONFIG_NFT_OBJREF=m
105104
CONFIG_NFT_QUEUE=m
106105
CONFIG_NFT_QUOTA=m
107106
CONFIG_NFT_REJECT=m
@@ -578,15 +577,13 @@ CONFIG_ASYNC_RAID6_TEST=m
578577
CONFIG_TEST_HEXDUMP=m
579578
CONFIG_STRING_SELFTEST=m
580579
CONFIG_TEST_STRING_HELPERS=m
581-
CONFIG_TEST_STRSCPY=m
582580
CONFIG_TEST_KSTRTOX=m
583581
CONFIG_TEST_PRINTF=m
584582
CONFIG_TEST_SCANF=m
585583
CONFIG_TEST_BITMAP=m
586584
CONFIG_TEST_UUID=m
587585
CONFIG_TEST_XARRAY=m
588586
CONFIG_TEST_RHASHTABLE=m
589-
CONFIG_TEST_SIPHASH=m
590587
CONFIG_TEST_IDA=m
591588
CONFIG_TEST_BITOPS=m
592589
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ CONFIG_NFT_MASQ=m
103103
CONFIG_NFT_REDIR=m
104104
CONFIG_NFT_NAT=m
105105
CONFIG_NFT_TUNNEL=m
106-
CONFIG_NFT_OBJREF=m
107106
CONFIG_NFT_QUEUE=m
108107
CONFIG_NFT_QUOTA=m
109108
CONFIG_NFT_REJECT=m
@@ -588,15 +587,13 @@ CONFIG_ASYNC_RAID6_TEST=m
588587
CONFIG_TEST_HEXDUMP=m
589588
CONFIG_STRING_SELFTEST=m
590589
CONFIG_TEST_STRING_HELPERS=m
591-
CONFIG_TEST_STRSCPY=m
592590
CONFIG_TEST_KSTRTOX=m
593591
CONFIG_TEST_PRINTF=m
594592
CONFIG_TEST_SCANF=m
595593
CONFIG_TEST_BITMAP=m
596594
CONFIG_TEST_UUID=m
597595
CONFIG_TEST_XARRAY=m
598596
CONFIG_TEST_RHASHTABLE=m
599-
CONFIG_TEST_SIPHASH=m
600597
CONFIG_TEST_IDA=m
601598
CONFIG_TEST_BITOPS=m
602599
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ CONFIG_NFT_MASQ=m
102102
CONFIG_NFT_REDIR=m
103103
CONFIG_NFT_NAT=m
104104
CONFIG_NFT_TUNNEL=m
105-
CONFIG_NFT_OBJREF=m
106105
CONFIG_NFT_QUEUE=m
107106
CONFIG_NFT_QUOTA=m
108107
CONFIG_NFT_REJECT=m
@@ -609,15 +608,13 @@ CONFIG_ASYNC_RAID6_TEST=m
609608
CONFIG_TEST_HEXDUMP=m
610609
CONFIG_STRING_SELFTEST=m
611610
CONFIG_TEST_STRING_HELPERS=m
612-
CONFIG_TEST_STRSCPY=m
613611
CONFIG_TEST_KSTRTOX=m
614612
CONFIG_TEST_PRINTF=m
615613
CONFIG_TEST_SCANF=m
616614
CONFIG_TEST_BITMAP=m
617615
CONFIG_TEST_UUID=m
618616
CONFIG_TEST_XARRAY=m
619617
CONFIG_TEST_RHASHTABLE=m
620-
CONFIG_TEST_SIPHASH=m
621618
CONFIG_TEST_IDA=m
622619
CONFIG_TEST_BITOPS=m
623620
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ CONFIG_NFT_MASQ=m
122122
CONFIG_NFT_REDIR=m
123123
CONFIG_NFT_NAT=m
124124
CONFIG_NFT_TUNNEL=m
125-
CONFIG_NFT_OBJREF=m
126125
CONFIG_NFT_QUEUE=m
127126
CONFIG_NFT_QUOTA=m
128127
CONFIG_NFT_REJECT=m
@@ -315,6 +314,7 @@ CONFIG_AF_KCM=m
315314
# CONFIG_WIRELESS is not set
316315
CONFIG_PSAMPLE=m
317316
CONFIG_NET_IFE=m
317+
CONFIG_PCCARD=y
318318
CONFIG_DEVTMPFS=y
319319
CONFIG_DEVTMPFS_MOUNT=y
320320
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -695,15 +695,13 @@ CONFIG_ASYNC_RAID6_TEST=m
695695
CONFIG_TEST_HEXDUMP=m
696696
CONFIG_STRING_SELFTEST=m
697697
CONFIG_TEST_STRING_HELPERS=m
698-
CONFIG_TEST_STRSCPY=m
699698
CONFIG_TEST_KSTRTOX=m
700699
CONFIG_TEST_PRINTF=m
701700
CONFIG_TEST_SCANF=m
702701
CONFIG_TEST_BITMAP=m
703702
CONFIG_TEST_UUID=m
704703
CONFIG_TEST_XARRAY=m
705704
CONFIG_TEST_RHASHTABLE=m
706-
CONFIG_TEST_SIPHASH=m
707705
CONFIG_TEST_IDA=m
708706
CONFIG_TEST_BITOPS=m
709707
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_NFT_MASQ=m
100100
CONFIG_NFT_REDIR=m
101101
CONFIG_NFT_NAT=m
102102
CONFIG_NFT_TUNNEL=m
103-
CONFIG_NFT_OBJREF=m
104103
CONFIG_NFT_QUEUE=m
105104
CONFIG_NFT_QUOTA=m
106105
CONFIG_NFT_REJECT=m
@@ -577,15 +576,13 @@ CONFIG_ASYNC_RAID6_TEST=m
577576
CONFIG_TEST_HEXDUMP=m
578577
CONFIG_STRING_SELFTEST=m
579578
CONFIG_TEST_STRING_HELPERS=m
580-
CONFIG_TEST_STRSCPY=m
581579
CONFIG_TEST_KSTRTOX=m
582580
CONFIG_TEST_PRINTF=m
583581
CONFIG_TEST_SCANF=m
584582
CONFIG_TEST_BITMAP=m
585583
CONFIG_TEST_UUID=m
586584
CONFIG_TEST_XARRAY=m
587585
CONFIG_TEST_RHASHTABLE=m
588-
CONFIG_TEST_SIPHASH=m
589586
CONFIG_TEST_IDA=m
590587
CONFIG_TEST_BITOPS=m
591588
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ CONFIG_NFT_MASQ=m
101101
CONFIG_NFT_REDIR=m
102102
CONFIG_NFT_NAT=m
103103
CONFIG_NFT_TUNNEL=m
104-
CONFIG_NFT_OBJREF=m
105104
CONFIG_NFT_QUEUE=m
106105
CONFIG_NFT_QUOTA=m
107106
CONFIG_NFT_REJECT=m
@@ -578,15 +577,13 @@ CONFIG_ASYNC_RAID6_TEST=m
578577
CONFIG_TEST_HEXDUMP=m
579578
CONFIG_STRING_SELFTEST=m
580579
CONFIG_TEST_STRING_HELPERS=m
581-
CONFIG_TEST_STRSCPY=m
582580
CONFIG_TEST_KSTRTOX=m
583581
CONFIG_TEST_PRINTF=m
584582
CONFIG_TEST_SCANF=m
585583
CONFIG_TEST_BITMAP=m
586584
CONFIG_TEST_UUID=m
587585
CONFIG_TEST_XARRAY=m
588586
CONFIG_TEST_RHASHTABLE=m
589-
CONFIG_TEST_SIPHASH=m
590587
CONFIG_TEST_IDA=m
591588
CONFIG_TEST_BITOPS=m
592589
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ CONFIG_NFT_MASQ=m
102102
CONFIG_NFT_REDIR=m
103103
CONFIG_NFT_NAT=m
104104
CONFIG_NFT_TUNNEL=m
105-
CONFIG_NFT_OBJREF=m
106105
CONFIG_NFT_QUEUE=m
107106
CONFIG_NFT_QUOTA=m
108107
CONFIG_NFT_REJECT=m
@@ -596,15 +595,13 @@ CONFIG_ASYNC_RAID6_TEST=m
596595
CONFIG_TEST_HEXDUMP=m
597596
CONFIG_STRING_SELFTEST=m
598597
CONFIG_TEST_STRING_HELPERS=m
599-
CONFIG_TEST_STRSCPY=m
600598
CONFIG_TEST_KSTRTOX=m
601599
CONFIG_TEST_PRINTF=m
602600
CONFIG_TEST_SCANF=m
603601
CONFIG_TEST_BITMAP=m
604602
CONFIG_TEST_UUID=m
605603
CONFIG_TEST_XARRAY=m
606604
CONFIG_TEST_RHASHTABLE=m
607-
CONFIG_TEST_SIPHASH=m
608605
CONFIG_TEST_IDA=m
609606
CONFIG_TEST_BITOPS=m
610607
CONFIG_TEST_VMALLOC=m

0 commit comments

Comments
 (0)