Commit 75003fa7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - Fix forward secrecy of RNG seed boot record handling

 - Make RNG seed boot record handling generic for all m68k platforms
   using bootinfo

 - defconfig updates

 - Minor fixes and improvements

* tag 'm68k-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED
  m68k: Process bootinfo records before saving them
  m68k: defconfig: Update defconfigs for v6.0-rc2
  m68k: Allow kexec on M68KCLASSIC with MMU enabled only
  m68k: Move from strlcpy with unused retval to strscpy
parents fb443f36 dc63a086

arch/m68k/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ config MMU_SUN3 


config KEXEC

	bool "kexec system call"

	depends on M68KCLASSIC

	depends on M68KCLASSIC && MMU

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your

arch/m68k/configs/amiga_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -573,9 +572,9 @@ 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_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -594,6 +593,7 @@ 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

arch/m68k/configs/apollo_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -530,9 +529,9 @@ 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_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -551,6 +550,7 @@ 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

arch/m68k/configs/atari_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -550,9 +549,9 @@ 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_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -571,6 +570,7 @@ 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

arch/m68k/configs/bvme6000_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -522,9 +521,9 @@ 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_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -543,6 +542,7 @@ 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