Skip to content

Commit 17cfb9d

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - update Finn's email address in MAINTAINERS - defconfig updates - minor fixes and improvements * tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning m68k: defconfig: Update defconfigs for v5.13-rc1 MAINTAINERS, .mailmap: Update Finn Thain's email address m68k: dma: Remove unnecessary include of asm/cacheflush.h m68k: Drop -fno-strength-reduce from KBUILD_CFLAGS
2 parents 1b1cf8f + c1367ee commit 17cfb9d

18 files changed

Lines changed: 43 additions & 34 deletions

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br>
102102
Felix Kuhling <fxkuehl@gmx.de>
103103
Felix Moeller <felix@derklecks.de>
104104
Filipe Lautert <filipe@icewall.org>
105+
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
105106
Franck Bui-Huu <vagabon.xyz@gmail.com>
106107
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
107108
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

‎MAINTAINERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12598,7 +12598,7 @@ S: Orphan
1259812598
F: drivers/net/ethernet/natsemi/natsemi.c
1259912599

1260012600
NCR 5380 SCSI DRIVERS
12601-
M: Finn Thain <fthain@telegraphics.com.au>
12601+
M: Finn Thain <fthain@linux-m68k.org>
1260212602
M: Michael Schmitz <schmitzmic@gmail.com>
1260312603
L: linux-scsi@vger.kernel.org
1260412604
S: Maintained
@@ -13070,7 +13070,7 @@ F: Documentation/filesystems/ntfs.rst
1307013070
F: fs/ntfs/
1307113071

1307213072
NUBUS SUBSYSTEM
13073-
M: Finn Thain <fthain@telegraphics.com.au>
13073+
M: Finn Thain <fthain@linux-m68k.org>
1307413074
L: linux-m68k@lists.linux-m68k.org
1307513075
S: Maintained
1307613076
F: arch/*/include/asm/nubus.h

‎arch/m68k/Kconfig.machine‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ config ATARI
2525
this kernel on an Atari, say Y here and browse the material
2626
available in <file:Documentation/m68k>; otherwise say N.
2727

28+
config ATARI_KBD_CORE
29+
bool
30+
2831
config MAC
2932
bool "Macintosh support"
3033
depends on MMU

‎arch/m68k/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ KBUILD_CFLAGS += $(cpuflags-y)
6666
KBUILD_CFLAGS += -pipe -ffreestanding
6767

6868
ifdef CONFIG_MMU
69-
# without -fno-strength-reduce the 53c7xx.c driver fails ;-(
70-
KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2
69+
KBUILD_CFLAGS += -ffixed-a2
7170
else
7271
# we can use a m68k-linux-gcc toolchain with these in place
7372
KBUILD_CPPFLAGS += -DUTS_SYSNAME=\"uClinux\"

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ CONFIG_IPV6_VTI=m
8585
CONFIG_IPV6_GRE=m
8686
CONFIG_NETFILTER=y
8787
CONFIG_NF_CONNTRACK=m
88-
CONFIG_NF_LOG_NETDEV=m
8988
CONFIG_NF_CONNTRACK_ZONES=y
9089
# CONFIG_NF_CONNTRACK_PROCFS is not set
9190
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -207,6 +206,7 @@ CONFIG_NFT_FIB_IPV4=m
207206
CONFIG_NF_TABLES_ARP=y
208207
CONFIG_NF_FLOW_TABLE_IPV4=m
209208
CONFIG_NF_LOG_ARP=m
209+
CONFIG_NF_LOG_IPV4=m
210210
CONFIG_IP_NF_IPTABLES=m
211211
CONFIG_IP_NF_MATCH_AH=m
212212
CONFIG_IP_NF_MATCH_ECN=m
@@ -253,7 +253,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
253253
CONFIG_NF_TABLES_BRIDGE=m
254254
CONFIG_NFT_BRIDGE_META=m
255255
CONFIG_NFT_BRIDGE_REJECT=m
256-
CONFIG_NF_LOG_BRIDGE=m
257256
CONFIG_NF_CONNTRACK_BRIDGE=m
258257
CONFIG_BRIDGE_NF_EBTABLES=m
259258
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -563,6 +562,7 @@ CONFIG_CRYPTO_TEST=m
563562
CONFIG_CRYPTO_RSA=m
564563
CONFIG_CRYPTO_DH=m
565564
CONFIG_CRYPTO_ECDH=m
565+
CONFIG_CRYPTO_ECDSA=m
566566
CONFIG_CRYPTO_ECRDSA=m
567567
CONFIG_CRYPTO_SM2=m
568568
CONFIG_CRYPTO_CURVE25519=m
@@ -627,6 +627,7 @@ CONFIG_KUNIT_ALL_TESTS=m
627627
CONFIG_TEST_LIST_SORT=m
628628
CONFIG_TEST_MIN_HEAP=m
629629
CONFIG_TEST_SORT=m
630+
CONFIG_TEST_DIV64=m
630631
CONFIG_REED_SOLOMON_TEST=m
631632
CONFIG_ATOMIC64_SELFTEST=m
632633
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ CONFIG_IPV6_VTI=m
8181
CONFIG_IPV6_GRE=m
8282
CONFIG_NETFILTER=y
8383
CONFIG_NF_CONNTRACK=m
84-
CONFIG_NF_LOG_NETDEV=m
8584
CONFIG_NF_CONNTRACK_ZONES=y
8685
# CONFIG_NF_CONNTRACK_PROCFS is not set
8786
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -203,6 +202,7 @@ CONFIG_NFT_FIB_IPV4=m
203202
CONFIG_NF_TABLES_ARP=y
204203
CONFIG_NF_FLOW_TABLE_IPV4=m
205204
CONFIG_NF_LOG_ARP=m
205+
CONFIG_NF_LOG_IPV4=m
206206
CONFIG_IP_NF_IPTABLES=m
207207
CONFIG_IP_NF_MATCH_AH=m
208208
CONFIG_IP_NF_MATCH_ECN=m
@@ -249,7 +249,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
249249
CONFIG_NF_TABLES_BRIDGE=m
250250
CONFIG_NFT_BRIDGE_META=m
251251
CONFIG_NFT_BRIDGE_REJECT=m
252-
CONFIG_NF_LOG_BRIDGE=m
253252
CONFIG_NF_CONNTRACK_BRIDGE=m
254253
CONFIG_BRIDGE_NF_EBTABLES=m
255254
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -519,6 +518,7 @@ CONFIG_CRYPTO_TEST=m
519518
CONFIG_CRYPTO_RSA=m
520519
CONFIG_CRYPTO_DH=m
521520
CONFIG_CRYPTO_ECDH=m
521+
CONFIG_CRYPTO_ECDSA=m
522522
CONFIG_CRYPTO_ECRDSA=m
523523
CONFIG_CRYPTO_SM2=m
524524
CONFIG_CRYPTO_CURVE25519=m
@@ -583,6 +583,7 @@ CONFIG_KUNIT_ALL_TESTS=m
583583
CONFIG_TEST_LIST_SORT=m
584584
CONFIG_TEST_MIN_HEAP=m
585585
CONFIG_TEST_SORT=m
586+
CONFIG_TEST_DIV64=m
586587
CONFIG_REED_SOLOMON_TEST=m
587588
CONFIG_ATOMIC64_SELFTEST=m
588589
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ CONFIG_IPV6_VTI=m
8888
CONFIG_IPV6_GRE=m
8989
CONFIG_NETFILTER=y
9090
CONFIG_NF_CONNTRACK=m
91-
CONFIG_NF_LOG_NETDEV=m
9291
CONFIG_NF_CONNTRACK_ZONES=y
9392
# CONFIG_NF_CONNTRACK_PROCFS is not set
9493
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -210,6 +209,7 @@ CONFIG_NFT_FIB_IPV4=m
210209
CONFIG_NF_TABLES_ARP=y
211210
CONFIG_NF_FLOW_TABLE_IPV4=m
212211
CONFIG_NF_LOG_ARP=m
212+
CONFIG_NF_LOG_IPV4=m
213213
CONFIG_IP_NF_IPTABLES=m
214214
CONFIG_IP_NF_MATCH_AH=m
215215
CONFIG_IP_NF_MATCH_ECN=m
@@ -256,7 +256,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
256256
CONFIG_NF_TABLES_BRIDGE=m
257257
CONFIG_NFT_BRIDGE_META=m
258258
CONFIG_NFT_BRIDGE_REJECT=m
259-
CONFIG_NF_LOG_BRIDGE=m
260259
CONFIG_NF_CONNTRACK_BRIDGE=m
261260
CONFIG_BRIDGE_NF_EBTABLES=m
262261
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -541,6 +540,7 @@ CONFIG_CRYPTO_TEST=m
541540
CONFIG_CRYPTO_RSA=m
542541
CONFIG_CRYPTO_DH=m
543542
CONFIG_CRYPTO_ECDH=m
543+
CONFIG_CRYPTO_ECDSA=m
544544
CONFIG_CRYPTO_ECRDSA=m
545545
CONFIG_CRYPTO_SM2=m
546546
CONFIG_CRYPTO_CURVE25519=m
@@ -605,6 +605,7 @@ CONFIG_KUNIT_ALL_TESTS=m
605605
CONFIG_TEST_LIST_SORT=m
606606
CONFIG_TEST_MIN_HEAP=m
607607
CONFIG_TEST_SORT=m
608+
CONFIG_TEST_DIV64=m
608609
CONFIG_REED_SOLOMON_TEST=m
609610
CONFIG_ATOMIC64_SELFTEST=m
610611
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_IPV6_VTI=m
7878
CONFIG_IPV6_GRE=m
7979
CONFIG_NETFILTER=y
8080
CONFIG_NF_CONNTRACK=m
81-
CONFIG_NF_LOG_NETDEV=m
8281
CONFIG_NF_CONNTRACK_ZONES=y
8382
# CONFIG_NF_CONNTRACK_PROCFS is not set
8483
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -200,6 +199,7 @@ CONFIG_NFT_FIB_IPV4=m
200199
CONFIG_NF_TABLES_ARP=y
201200
CONFIG_NF_FLOW_TABLE_IPV4=m
202201
CONFIG_NF_LOG_ARP=m
202+
CONFIG_NF_LOG_IPV4=m
203203
CONFIG_IP_NF_IPTABLES=m
204204
CONFIG_IP_NF_MATCH_AH=m
205205
CONFIG_IP_NF_MATCH_ECN=m
@@ -246,7 +246,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
246246
CONFIG_NF_TABLES_BRIDGE=m
247247
CONFIG_NFT_BRIDGE_META=m
248248
CONFIG_NFT_BRIDGE_REJECT=m
249-
CONFIG_NF_LOG_BRIDGE=m
250249
CONFIG_NF_CONNTRACK_BRIDGE=m
251250
CONFIG_BRIDGE_NF_EBTABLES=m
252251
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -512,6 +511,7 @@ CONFIG_CRYPTO_TEST=m
512511
CONFIG_CRYPTO_RSA=m
513512
CONFIG_CRYPTO_DH=m
514513
CONFIG_CRYPTO_ECDH=m
514+
CONFIG_CRYPTO_ECDSA=m
515515
CONFIG_CRYPTO_ECRDSA=m
516516
CONFIG_CRYPTO_SM2=m
517517
CONFIG_CRYPTO_CURVE25519=m
@@ -576,6 +576,7 @@ CONFIG_KUNIT_ALL_TESTS=m
576576
CONFIG_TEST_LIST_SORT=m
577577
CONFIG_TEST_MIN_HEAP=m
578578
CONFIG_TEST_SORT=m
579+
CONFIG_TEST_DIV64=m
579580
CONFIG_REED_SOLOMON_TEST=m
580581
CONFIG_ATOMIC64_SELFTEST=m
581582
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ CONFIG_IPV6_VTI=m
8080
CONFIG_IPV6_GRE=m
8181
CONFIG_NETFILTER=y
8282
CONFIG_NF_CONNTRACK=m
83-
CONFIG_NF_LOG_NETDEV=m
8483
CONFIG_NF_CONNTRACK_ZONES=y
8584
# CONFIG_NF_CONNTRACK_PROCFS is not set
8685
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -202,6 +201,7 @@ CONFIG_NFT_FIB_IPV4=m
202201
CONFIG_NF_TABLES_ARP=y
203202
CONFIG_NF_FLOW_TABLE_IPV4=m
204203
CONFIG_NF_LOG_ARP=m
204+
CONFIG_NF_LOG_IPV4=m
205205
CONFIG_IP_NF_IPTABLES=m
206206
CONFIG_IP_NF_MATCH_AH=m
207207
CONFIG_IP_NF_MATCH_ECN=m
@@ -248,7 +248,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
248248
CONFIG_NF_TABLES_BRIDGE=m
249249
CONFIG_NFT_BRIDGE_META=m
250250
CONFIG_NFT_BRIDGE_REJECT=m
251-
CONFIG_NF_LOG_BRIDGE=m
252251
CONFIG_NF_CONNTRACK_BRIDGE=m
253252
CONFIG_BRIDGE_NF_EBTABLES=m
254253
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -521,6 +520,7 @@ CONFIG_CRYPTO_TEST=m
521520
CONFIG_CRYPTO_RSA=m
522521
CONFIG_CRYPTO_DH=m
523522
CONFIG_CRYPTO_ECDH=m
523+
CONFIG_CRYPTO_ECDSA=m
524524
CONFIG_CRYPTO_ECRDSA=m
525525
CONFIG_CRYPTO_SM2=m
526526
CONFIG_CRYPTO_CURVE25519=m
@@ -585,6 +585,7 @@ CONFIG_KUNIT_ALL_TESTS=m
585585
CONFIG_TEST_LIST_SORT=m
586586
CONFIG_TEST_MIN_HEAP=m
587587
CONFIG_TEST_SORT=m
588+
CONFIG_TEST_DIV64=m
588589
CONFIG_REED_SOLOMON_TEST=m
589590
CONFIG_ATOMIC64_SELFTEST=m
590591
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_IPV6_VTI=m
7979
CONFIG_IPV6_GRE=m
8080
CONFIG_NETFILTER=y
8181
CONFIG_NF_CONNTRACK=m
82-
CONFIG_NF_LOG_NETDEV=m
8382
CONFIG_NF_CONNTRACK_ZONES=y
8483
# CONFIG_NF_CONNTRACK_PROCFS is not set
8584
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -201,6 +200,7 @@ CONFIG_NFT_FIB_IPV4=m
201200
CONFIG_NF_TABLES_ARP=y
202201
CONFIG_NF_FLOW_TABLE_IPV4=m
203202
CONFIG_NF_LOG_ARP=m
203+
CONFIG_NF_LOG_IPV4=m
204204
CONFIG_IP_NF_IPTABLES=m
205205
CONFIG_IP_NF_MATCH_AH=m
206206
CONFIG_IP_NF_MATCH_ECN=m
@@ -247,7 +247,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
247247
CONFIG_NF_TABLES_BRIDGE=m
248248
CONFIG_NFT_BRIDGE_META=m
249249
CONFIG_NFT_BRIDGE_REJECT=m
250-
CONFIG_NF_LOG_BRIDGE=m
251250
CONFIG_NF_CONNTRACK_BRIDGE=m
252251
CONFIG_BRIDGE_NF_EBTABLES=m
253252
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -543,6 +542,7 @@ CONFIG_CRYPTO_TEST=m
543542
CONFIG_CRYPTO_RSA=m
544543
CONFIG_CRYPTO_DH=m
545544
CONFIG_CRYPTO_ECDH=m
545+
CONFIG_CRYPTO_ECDSA=m
546546
CONFIG_CRYPTO_ECRDSA=m
547547
CONFIG_CRYPTO_SM2=m
548548
CONFIG_CRYPTO_CURVE25519=m
@@ -607,6 +607,7 @@ CONFIG_KUNIT_ALL_TESTS=m
607607
CONFIG_TEST_LIST_SORT=m
608608
CONFIG_TEST_MIN_HEAP=m
609609
CONFIG_TEST_SORT=m
610+
CONFIG_TEST_DIV64=m
610611
CONFIG_REED_SOLOMON_TEST=m
611612
CONFIG_ATOMIC64_SELFTEST=m
612613
CONFIG_ASYNC_RAID6_TEST=m

0 commit comments

Comments
 (0)