Commit bb2d9e54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - Remove <asm/export.h>

 - Miscellaneous W=1 fixes

 - defconfig updates

* tag 'm68k-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  zorro: Include zorro.h in names.c
  m68k: Add memcmp() declaration
  m68k: Define __div64_32() to avoid a warning
  m68k: Remove <asm/export.h>
  m68k: Replace #include <asm/export.h> with #include <linux/export.h>
  m68k: defconfig: Update defconfigs for v6.5-rc1
parents e5b7ca09 eb1e6ccd

arch/m68k/configs/amiga_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ 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
@@ -635,6 +634,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/apollo_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ 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
@@ -591,6 +590,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/atari_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ 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
@@ -612,6 +611,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/bvme6000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ 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
@@ -583,6 +582,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/hp300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ 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
@@ -593,6 +592,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m