Commit 6a713827 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - defconfig updates

 - Use common scripts for syscall table and header generation

 - Fix timers on MVME platforms

 - Fix lock imbalance in cacheflush syscall

 - Minor fixes and improvements

* tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: sun3x: Remove unneeded semicolon
  m68k: Add missing mmap_read_lock() to sys_cacheflush()
  m68k: fpsp040,ifpsp060: Remove meaningless EXTRA_LDFLAGS
  m68k: fpsp040: Remove meaningless $(OS_OBJS)
  m68k: mvme147,mvme16x: Don't wipe PCC timer config bits
  m68k: syscalls: switch to generic syscallhdr.sh
  m68k: syscalls: switch to generic syscalltbl.sh
  m68k: defconfig: Update defconfigs for v5.12-rc1
  m68k: mm: Fix flatmem memory model setup
parents 69f737ed 34e5269b

arch/m68k/configs/amiga_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -580,12 +580,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -598,7 +594,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

arch/m68k/configs/apollo_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -536,12 +536,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -554,7 +550,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

arch/m68k/configs/atari_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -558,12 +558,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -576,7 +572,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

arch/m68k/configs/bvme6000_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -529,12 +529,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -547,7 +543,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

arch/m68k/configs/hp300_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -538,12 +538,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -556,7 +552,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m