Commit 17cfb9d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b1cf8fe c1367ee0

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br> 
Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -12598,7 +12598,7 @@ S: Orphan 
F:	drivers/net/ethernet/natsemi/natsemi.c









NCR 5380 SCSI DRIVERS









M:	Finn Thain <fthain@telegraphics.com.au>









M:	Finn Thain <fthain@linux-m68k.org>









M:	Michael Schmitz <schmitzmic@gmail.com>









L:	linux-scsi@vger.kernel.org









S:	Maintained








@@ -13070,7 +13070,7 @@ F:	Documentation/filesystems/ntfs.rst







F:	fs/ntfs/

















NUBUS SUBSYSTEM









M:	Finn Thain <fthain@telegraphics.com.au>









M:	Finn Thain <fthain@linux-m68k.org>









L:	linux-m68k@lists.linux-m68k.org









S:	Maintained









F:	arch/*/include/asm/nubus.h
































arch/m68k/Kconfig.machine



+3
−0






























Original line number
Diff line number
Diff line







@@ -25,6 +25,9 @@ config ATARI







	  this kernel on an Atari, say Y here and browse the material









	  available in <file:Documentation/m68k>; otherwise say N.



















config ATARI_KBD_CORE









	bool



















config MAC









	bool "Macintosh support"









	depends on MMU
































arch/m68k/Makefile



+1
−2






























Original line number
Diff line number
Diff line







@@ -66,8 +66,7 @@ KBUILD_CFLAGS += $(cpuflags-y)







KBUILD_CFLAGS += -pipe -ffreestanding



















ifdef CONFIG_MMU









# without -fno-strength-reduce the 53c7xx.c driver fails ;-(









KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2









KBUILD_CFLAGS += -ffixed-a2









else









# we can use a m68k-linux-gcc toolchain with these in place









KBUILD_CPPFLAGS += -DUTS_SYSNAME=\"uClinux\"
































arch/m68k/configs/amiga_defconfig



+3
−2






























Original line number
Diff line number
Diff line







@@ -85,7 +85,6 @@ CONFIG_IPV6_VTI=m







CONFIG_IPV6_GRE=m









CONFIG_NETFILTER=y









CONFIG_NF_CONNTRACK=m









CONFIG_NF_LOG_NETDEV=m









CONFIG_NF_CONNTRACK_ZONES=y









# CONFIG_NF_CONNTRACK_PROCFS is not set









# CONFIG_NF_CT_PROTO_DCCP is not set








@@ -207,6 +206,7 @@ CONFIG_NFT_FIB_IPV4=m







CONFIG_NF_TABLES_ARP=y









CONFIG_NF_FLOW_TABLE_IPV4=m









CONFIG_NF_LOG_ARP=m









CONFIG_NF_LOG_IPV4=m









CONFIG_IP_NF_IPTABLES=m









CONFIG_IP_NF_MATCH_AH=m









CONFIG_IP_NF_MATCH_ECN=m








@@ -253,7 +253,6 @@ CONFIG_IP6_NF_TARGET_NPT=m







CONFIG_NF_TABLES_BRIDGE=m









CONFIG_NFT_BRIDGE_META=m









CONFIG_NFT_BRIDGE_REJECT=m









CONFIG_NF_LOG_BRIDGE=m









CONFIG_NF_CONNTRACK_BRIDGE=m









CONFIG_BRIDGE_NF_EBTABLES=m









CONFIG_BRIDGE_EBT_BROUTE=m








@@ -563,6 +562,7 @@ CONFIG_CRYPTO_TEST=m







CONFIG_CRYPTO_RSA=m









CONFIG_CRYPTO_DH=m









CONFIG_CRYPTO_ECDH=m









CONFIG_CRYPTO_ECDSA=m









CONFIG_CRYPTO_ECRDSA=m









CONFIG_CRYPTO_SM2=m









CONFIG_CRYPTO_CURVE25519=m








@@ -627,6 +627,7 @@ CONFIG_KUNIT_ALL_TESTS=m







CONFIG_TEST_LIST_SORT=m









CONFIG_TEST_MIN_HEAP=m









CONFIG_TEST_SORT=m









CONFIG_TEST_DIV64=m









CONFIG_REED_SOLOMON_TEST=m









CONFIG_ATOMIC64_SELFTEST=m









CONFIG_ASYNC_RAID6_TEST=m