Skip to content

Commit 75003fa

Browse files
torvaldstorvalds
committed
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
2 parents fb443f3 + dc63a08 commit 75003fa

File tree

17 files changed

+50
-46
lines changed

17 files changed

+50
-46
lines changed

‎arch/m68k/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ config MMU_SUN3
8787

8888
config KEXEC
8989
bool "kexec system call"
90-
depends on M68KCLASSIC
90+
depends on M68KCLASSIC && MMU
9191
select KEXEC_CORE
9292
help
9393
kexec is a system call that implements the ability to shutdown your

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ CONFIG_NETFILTER=y
8484
CONFIG_NETFILTER_NETLINK_HOOK=m
8585
CONFIG_NF_CONNTRACK=m
8686
CONFIG_NF_CONNTRACK_ZONES=y
87-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8887
# CONFIG_NF_CT_PROTO_DCCP is not set
8988
CONFIG_NF_CONNTRACK_AMANDA=m
9089
CONFIG_NF_CONNTRACK_FTP=m
@@ -573,9 +572,9 @@ CONFIG_CRYPTO_PCBC=m
573572
CONFIG_CRYPTO_XTS=m
574573
CONFIG_CRYPTO_KEYWRAP=m
575574
CONFIG_CRYPTO_ADIANTUM=m
575+
CONFIG_CRYPTO_HCTR2=m
576576
CONFIG_CRYPTO_XCBC=m
577577
CONFIG_CRYPTO_VMAC=m
578-
CONFIG_CRYPTO_BLAKE2S=m
579578
CONFIG_CRYPTO_MD4=m
580579
CONFIG_CRYPTO_MICHAEL_MIC=m
581580
CONFIG_CRYPTO_RMD160=m
@@ -594,6 +593,7 @@ CONFIG_CRYPTO_DES=m
594593
CONFIG_CRYPTO_FCRYPT=m
595594
CONFIG_CRYPTO_KHAZAD=m
596595
CONFIG_CRYPTO_SEED=m
596+
CONFIG_CRYPTO_ARIA=m
597597
CONFIG_CRYPTO_SERPENT=m
598598
CONFIG_CRYPTO_SM4_GENERIC=m
599599
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ CONFIG_NETFILTER=y
8080
CONFIG_NETFILTER_NETLINK_HOOK=m
8181
CONFIG_NF_CONNTRACK=m
8282
CONFIG_NF_CONNTRACK_ZONES=y
83-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8483
# CONFIG_NF_CT_PROTO_DCCP is not set
8584
CONFIG_NF_CONNTRACK_AMANDA=m
8685
CONFIG_NF_CONNTRACK_FTP=m
@@ -530,9 +529,9 @@ CONFIG_CRYPTO_PCBC=m
530529
CONFIG_CRYPTO_XTS=m
531530
CONFIG_CRYPTO_KEYWRAP=m
532531
CONFIG_CRYPTO_ADIANTUM=m
532+
CONFIG_CRYPTO_HCTR2=m
533533
CONFIG_CRYPTO_XCBC=m
534534
CONFIG_CRYPTO_VMAC=m
535-
CONFIG_CRYPTO_BLAKE2S=m
536535
CONFIG_CRYPTO_MD4=m
537536
CONFIG_CRYPTO_MICHAEL_MIC=m
538537
CONFIG_CRYPTO_RMD160=m
@@ -551,6 +550,7 @@ CONFIG_CRYPTO_DES=m
551550
CONFIG_CRYPTO_FCRYPT=m
552551
CONFIG_CRYPTO_KHAZAD=m
553552
CONFIG_CRYPTO_SEED=m
553+
CONFIG_CRYPTO_ARIA=m
554554
CONFIG_CRYPTO_SERPENT=m
555555
CONFIG_CRYPTO_SM4_GENERIC=m
556556
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ CONFIG_NETFILTER=y
8787
CONFIG_NETFILTER_NETLINK_HOOK=m
8888
CONFIG_NF_CONNTRACK=m
8989
CONFIG_NF_CONNTRACK_ZONES=y
90-
# CONFIG_NF_CONNTRACK_PROCFS is not set
9190
# CONFIG_NF_CT_PROTO_DCCP is not set
9291
CONFIG_NF_CONNTRACK_AMANDA=m
9392
CONFIG_NF_CONNTRACK_FTP=m
@@ -550,9 +549,9 @@ CONFIG_CRYPTO_PCBC=m
550549
CONFIG_CRYPTO_XTS=m
551550
CONFIG_CRYPTO_KEYWRAP=m
552551
CONFIG_CRYPTO_ADIANTUM=m
552+
CONFIG_CRYPTO_HCTR2=m
553553
CONFIG_CRYPTO_XCBC=m
554554
CONFIG_CRYPTO_VMAC=m
555-
CONFIG_CRYPTO_BLAKE2S=m
556555
CONFIG_CRYPTO_MD4=m
557556
CONFIG_CRYPTO_MICHAEL_MIC=m
558557
CONFIG_CRYPTO_RMD160=m
@@ -571,6 +570,7 @@ CONFIG_CRYPTO_DES=m
571570
CONFIG_CRYPTO_FCRYPT=m
572571
CONFIG_CRYPTO_KHAZAD=m
573572
CONFIG_CRYPTO_SEED=m
573+
CONFIG_CRYPTO_ARIA=m
574574
CONFIG_CRYPTO_SERPENT=m
575575
CONFIG_CRYPTO_SM4_GENERIC=m
576576
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y
7777
CONFIG_NETFILTER_NETLINK_HOOK=m
7878
CONFIG_NF_CONNTRACK=m
7979
CONFIG_NF_CONNTRACK_ZONES=y
80-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8180
# CONFIG_NF_CT_PROTO_DCCP is not set
8281
CONFIG_NF_CONNTRACK_AMANDA=m
8382
CONFIG_NF_CONNTRACK_FTP=m
@@ -522,9 +521,9 @@ CONFIG_CRYPTO_PCBC=m
522521
CONFIG_CRYPTO_XTS=m
523522
CONFIG_CRYPTO_KEYWRAP=m
524523
CONFIG_CRYPTO_ADIANTUM=m
524+
CONFIG_CRYPTO_HCTR2=m
525525
CONFIG_CRYPTO_XCBC=m
526526
CONFIG_CRYPTO_VMAC=m
527-
CONFIG_CRYPTO_BLAKE2S=m
528527
CONFIG_CRYPTO_MD4=m
529528
CONFIG_CRYPTO_MICHAEL_MIC=m
530529
CONFIG_CRYPTO_RMD160=m
@@ -543,6 +542,7 @@ CONFIG_CRYPTO_DES=m
543542
CONFIG_CRYPTO_FCRYPT=m
544543
CONFIG_CRYPTO_KHAZAD=m
545544
CONFIG_CRYPTO_SEED=m
545+
CONFIG_CRYPTO_ARIA=m
546546
CONFIG_CRYPTO_SERPENT=m
547547
CONFIG_CRYPTO_SM4_GENERIC=m
548548
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y
7979
CONFIG_NETFILTER_NETLINK_HOOK=m
8080
CONFIG_NF_CONNTRACK=m
8181
CONFIG_NF_CONNTRACK_ZONES=y
82-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8382
# CONFIG_NF_CT_PROTO_DCCP is not set
8483
CONFIG_NF_CONNTRACK_AMANDA=m
8584
CONFIG_NF_CONNTRACK_FTP=m
@@ -532,9 +531,9 @@ CONFIG_CRYPTO_PCBC=m
532531
CONFIG_CRYPTO_XTS=m
533532
CONFIG_CRYPTO_KEYWRAP=m
534533
CONFIG_CRYPTO_ADIANTUM=m
534+
CONFIG_CRYPTO_HCTR2=m
535535
CONFIG_CRYPTO_XCBC=m
536536
CONFIG_CRYPTO_VMAC=m
537-
CONFIG_CRYPTO_BLAKE2S=m
538537
CONFIG_CRYPTO_MD4=m
539538
CONFIG_CRYPTO_MICHAEL_MIC=m
540539
CONFIG_CRYPTO_RMD160=m
@@ -553,6 +552,7 @@ CONFIG_CRYPTO_DES=m
553552
CONFIG_CRYPTO_FCRYPT=m
554553
CONFIG_CRYPTO_KHAZAD=m
555554
CONFIG_CRYPTO_SEED=m
555+
CONFIG_CRYPTO_ARIA=m
556556
CONFIG_CRYPTO_SERPENT=m
557557
CONFIG_CRYPTO_SM4_GENERIC=m
558558
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_NETFILTER=y
7878
CONFIG_NETFILTER_NETLINK_HOOK=m
7979
CONFIG_NF_CONNTRACK=m
8080
CONFIG_NF_CONNTRACK_ZONES=y
81-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8281
# CONFIG_NF_CT_PROTO_DCCP is not set
8382
CONFIG_NF_CONNTRACK_AMANDA=m
8483
CONFIG_NF_CONNTRACK_FTP=m
@@ -552,9 +551,9 @@ CONFIG_CRYPTO_PCBC=m
552551
CONFIG_CRYPTO_XTS=m
553552
CONFIG_CRYPTO_KEYWRAP=m
554553
CONFIG_CRYPTO_ADIANTUM=m
554+
CONFIG_CRYPTO_HCTR2=m
555555
CONFIG_CRYPTO_XCBC=m
556556
CONFIG_CRYPTO_VMAC=m
557-
CONFIG_CRYPTO_BLAKE2S=m
558557
CONFIG_CRYPTO_MD4=m
559558
CONFIG_CRYPTO_MICHAEL_MIC=m
560559
CONFIG_CRYPTO_RMD160=m
@@ -573,6 +572,7 @@ CONFIG_CRYPTO_DES=m
573572
CONFIG_CRYPTO_FCRYPT=m
574573
CONFIG_CRYPTO_KHAZAD=m
575574
CONFIG_CRYPTO_SEED=m
575+
CONFIG_CRYPTO_ARIA=m
576576
CONFIG_CRYPTO_SERPENT=m
577577
CONFIG_CRYPTO_SM4_GENERIC=m
578578
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ CONFIG_NETFILTER=y
9898
CONFIG_NETFILTER_NETLINK_HOOK=m
9999
CONFIG_NF_CONNTRACK=m
100100
CONFIG_NF_CONNTRACK_ZONES=y
101-
# CONFIG_NF_CONNTRACK_PROCFS is not set
102101
# CONFIG_NF_CT_PROTO_DCCP is not set
103102
CONFIG_NF_CONNTRACK_AMANDA=m
104103
CONFIG_NF_CONNTRACK_FTP=m
@@ -638,9 +637,9 @@ CONFIG_CRYPTO_PCBC=m
638637
CONFIG_CRYPTO_XTS=m
639638
CONFIG_CRYPTO_KEYWRAP=m
640639
CONFIG_CRYPTO_ADIANTUM=m
640+
CONFIG_CRYPTO_HCTR2=m
641641
CONFIG_CRYPTO_XCBC=m
642642
CONFIG_CRYPTO_VMAC=m
643-
CONFIG_CRYPTO_BLAKE2S=m
644643
CONFIG_CRYPTO_MD4=m
645644
CONFIG_CRYPTO_MICHAEL_MIC=m
646645
CONFIG_CRYPTO_RMD160=m
@@ -659,6 +658,7 @@ CONFIG_CRYPTO_DES=m
659658
CONFIG_CRYPTO_FCRYPT=m
660659
CONFIG_CRYPTO_KHAZAD=m
661660
CONFIG_CRYPTO_SEED=m
661+
CONFIG_CRYPTO_ARIA=m
662662
CONFIG_CRYPTO_SERPENT=m
663663
CONFIG_CRYPTO_SM4_GENERIC=m
664664
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ CONFIG_NETFILTER=y
7676
CONFIG_NETFILTER_NETLINK_HOOK=m
7777
CONFIG_NF_CONNTRACK=m
7878
CONFIG_NF_CONNTRACK_ZONES=y
79-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8079
# CONFIG_NF_CT_PROTO_DCCP is not set
8180
CONFIG_NF_CONNTRACK_AMANDA=m
8281
CONFIG_NF_CONNTRACK_FTP=m
@@ -521,9 +520,9 @@ CONFIG_CRYPTO_PCBC=m
521520
CONFIG_CRYPTO_XTS=m
522521
CONFIG_CRYPTO_KEYWRAP=m
523522
CONFIG_CRYPTO_ADIANTUM=m
523+
CONFIG_CRYPTO_HCTR2=m
524524
CONFIG_CRYPTO_XCBC=m
525525
CONFIG_CRYPTO_VMAC=m
526-
CONFIG_CRYPTO_BLAKE2S=m
527526
CONFIG_CRYPTO_MD4=m
528527
CONFIG_CRYPTO_MICHAEL_MIC=m
529528
CONFIG_CRYPTO_RMD160=m
@@ -542,6 +541,7 @@ CONFIG_CRYPTO_DES=m
542541
CONFIG_CRYPTO_FCRYPT=m
543542
CONFIG_CRYPTO_KHAZAD=m
544543
CONFIG_CRYPTO_SEED=m
544+
CONFIG_CRYPTO_ARIA=m
545545
CONFIG_CRYPTO_SERPENT=m
546546
CONFIG_CRYPTO_SM4_GENERIC=m
547547
CONFIG_CRYPTO_TEA=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y
7777
CONFIG_NETFILTER_NETLINK_HOOK=m
7878
CONFIG_NF_CONNTRACK=m
7979
CONFIG_NF_CONNTRACK_ZONES=y
80-
# CONFIG_NF_CONNTRACK_PROCFS is not set
8180
# CONFIG_NF_CT_PROTO_DCCP is not set
8281
CONFIG_NF_CONNTRACK_AMANDA=m
8382
CONFIG_NF_CONNTRACK_FTP=m
@@ -522,9 +521,9 @@ CONFIG_CRYPTO_PCBC=m
522521
CONFIG_CRYPTO_XTS=m
523522
CONFIG_CRYPTO_KEYWRAP=m
524523
CONFIG_CRYPTO_ADIANTUM=m
524+
CONFIG_CRYPTO_HCTR2=m
525525
CONFIG_CRYPTO_XCBC=m
526526
CONFIG_CRYPTO_VMAC=m
527-
CONFIG_CRYPTO_BLAKE2S=m
528527
CONFIG_CRYPTO_MD4=m
529528
CONFIG_CRYPTO_MICHAEL_MIC=m
530529
CONFIG_CRYPTO_RMD160=m
@@ -543,6 +542,7 @@ CONFIG_CRYPTO_DES=m
543542
CONFIG_CRYPTO_FCRYPT=m
544543
CONFIG_CRYPTO_KHAZAD=m
545544
CONFIG_CRYPTO_SEED=m
545+
CONFIG_CRYPTO_ARIA=m
546546
CONFIG_CRYPTO_SERPENT=m
547547
CONFIG_CRYPTO_SM4_GENERIC=m
548548
CONFIG_CRYPTO_TEA=m

0 commit comments

Comments
 (0)