Commit 49d07f01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - remove an unused function involving a non-explictly signed char type

 - reword a (correct) comment to stop the inflood of (incorrect) patches
   trying to fix it

 - defconfig updates

* tag 'm68k-for-v6.2-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.1-rc1
  m68k: mac: Reword comment using double "in"
  m68k: mac: Remove unused rbv_set_video_bpp()
parents 5977aa66 553b20b2

arch/m68k/configs/amiga_defconfig

+21 −21
Original line number Diff line number Diff line
@@ -562,29 +562,10 @@ CONFIG_CRYPTO_ECDSA=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -593,11 +574,30 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/apollo_defconfig

+21 −21
Original line number Diff line number Diff line
@@ -519,29 +519,10 @@ CONFIG_CRYPTO_ECDSA=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -550,11 +531,30 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/atari_defconfig

+21 −21
Original line number Diff line number Diff line
@@ -539,29 +539,10 @@ CONFIG_CRYPTO_ECDSA=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -570,11 +551,30 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/bvme6000_defconfig

+21 −21
Original line number Diff line number Diff line
@@ -511,29 +511,10 @@ CONFIG_CRYPTO_ECDSA=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -542,11 +523,30 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/hp300_defconfig

+21 −21
Original line number Diff line number Diff line
@@ -521,29 +521,10 @@ CONFIG_CRYPTO_ECDSA=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -552,11 +533,30 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m