Skip to content

Commit f730127

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - defconfig updates - miscellaneous fixes and improvements * tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: kexec: Include <linux/reboot.h> m68k: defconfig: Update defconfigs for v6.3-rc1 m68k: Remove obsolete config NO_KERNEL_MSG nubus: Drop noop match function
2 parents 173ea74 + aaee8c7 commit f730127

15 files changed

Lines changed: 25 additions & 24 deletions

‎arch/m68k/Kconfig.debug‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ config HIGHPROFILE
3636
help
3737
Use a fast secondary clock to produce profiling information.
3838

39-
config NO_KERNEL_MSG
40-
bool "Suppress Kernel BUG Messages"
41-
help
42-
Do not output any debug BUG messages within the kernel.
43-
4439
config BDM_DISABLE
4540
bool "Disable BDM signals"
4641
depends on COLDFIRE

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
214214
CONFIG_IP_NF_TARGET_NETMAP=m
215215
CONFIG_IP_NF_TARGET_REDIRECT=m
216216
CONFIG_IP_NF_MANGLE=m
217-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
218217
CONFIG_IP_NF_TARGET_ECN=m
219218
CONFIG_IP_NF_TARGET_TTL=m
220219
CONFIG_IP_NF_RAW=m
@@ -495,6 +494,7 @@ CONFIG_NFS_V4=m
495494
CONFIG_NFS_SWAP=y
496495
CONFIG_ROOT_NFS=y
497496
CONFIG_NFSD=m
497+
CONFIG_RPCSEC_GSS_KRB5=m
498498
CONFIG_CIFS=m
499499
# CONFIG_CIFS_STATS2 is not set
500500
# CONFIG_CIFS_DEBUG is not set
@@ -621,6 +621,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
621621
CONFIG_EARLY_PRINTK=y
622622
CONFIG_KUNIT=m
623623
CONFIG_KUNIT_ALL_TESTS=m
624+
CONFIG_TEST_DHRY=m
624625
CONFIG_TEST_MIN_HEAP=m
625626
CONFIG_TEST_DIV64=m
626627
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
210210
CONFIG_IP_NF_TARGET_NETMAP=m
211211
CONFIG_IP_NF_TARGET_REDIRECT=m
212212
CONFIG_IP_NF_MANGLE=m
213-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
214213
CONFIG_IP_NF_TARGET_ECN=m
215214
CONFIG_IP_NF_TARGET_TTL=m
216215
CONFIG_IP_NF_RAW=m
@@ -452,6 +451,7 @@ CONFIG_NFS_V4=m
452451
CONFIG_NFS_SWAP=y
453452
CONFIG_ROOT_NFS=y
454453
CONFIG_NFSD=m
454+
CONFIG_RPCSEC_GSS_KRB5=m
455455
CONFIG_CIFS=m
456456
# CONFIG_CIFS_STATS2 is not set
457457
# CONFIG_CIFS_DEBUG is not set
@@ -577,6 +577,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
577577
CONFIG_EARLY_PRINTK=y
578578
CONFIG_KUNIT=m
579579
CONFIG_KUNIT_ALL_TESTS=m
580+
CONFIG_TEST_DHRY=m
580581
CONFIG_TEST_MIN_HEAP=m
581582
CONFIG_TEST_DIV64=m
582583
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
217217
CONFIG_IP_NF_TARGET_NETMAP=m
218218
CONFIG_IP_NF_TARGET_REDIRECT=m
219219
CONFIG_IP_NF_MANGLE=m
220-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
221220
CONFIG_IP_NF_TARGET_ECN=m
222221
CONFIG_IP_NF_TARGET_TTL=m
223222
CONFIG_IP_NF_RAW=m
@@ -472,6 +471,7 @@ CONFIG_NFS_V4=m
472471
CONFIG_NFS_SWAP=y
473472
CONFIG_ROOT_NFS=y
474473
CONFIG_NFSD=m
474+
CONFIG_RPCSEC_GSS_KRB5=m
475475
CONFIG_CIFS=m
476476
# CONFIG_CIFS_STATS2 is not set
477477
# CONFIG_CIFS_DEBUG is not set
@@ -598,6 +598,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
598598
CONFIG_EARLY_PRINTK=y
599599
CONFIG_KUNIT=m
600600
CONFIG_KUNIT_ALL_TESTS=m
601+
CONFIG_TEST_DHRY=m
601602
CONFIG_TEST_MIN_HEAP=m
602603
CONFIG_TEST_DIV64=m
603604
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
207207
CONFIG_IP_NF_TARGET_NETMAP=m
208208
CONFIG_IP_NF_TARGET_REDIRECT=m
209209
CONFIG_IP_NF_MANGLE=m
210-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
211210
CONFIG_IP_NF_TARGET_ECN=m
212211
CONFIG_IP_NF_TARGET_TTL=m
213212
CONFIG_IP_NF_RAW=m
@@ -444,6 +443,7 @@ CONFIG_NFS_V4=m
444443
CONFIG_NFS_SWAP=y
445444
CONFIG_ROOT_NFS=y
446445
CONFIG_NFSD=m
446+
CONFIG_RPCSEC_GSS_KRB5=m
447447
CONFIG_CIFS=m
448448
# CONFIG_CIFS_STATS2 is not set
449449
# CONFIG_CIFS_DEBUG is not set
@@ -569,6 +569,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
569569
CONFIG_EARLY_PRINTK=y
570570
CONFIG_KUNIT=m
571571
CONFIG_KUNIT_ALL_TESTS=m
572+
CONFIG_TEST_DHRY=m
572573
CONFIG_TEST_MIN_HEAP=m
573574
CONFIG_TEST_DIV64=m
574575
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
209209
CONFIG_IP_NF_TARGET_NETMAP=m
210210
CONFIG_IP_NF_TARGET_REDIRECT=m
211211
CONFIG_IP_NF_MANGLE=m
212-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
213212
CONFIG_IP_NF_TARGET_ECN=m
214213
CONFIG_IP_NF_TARGET_TTL=m
215214
CONFIG_IP_NF_RAW=m
@@ -454,6 +453,7 @@ CONFIG_NFS_V4=m
454453
CONFIG_NFS_SWAP=y
455454
CONFIG_ROOT_NFS=y
456455
CONFIG_NFSD=m
456+
CONFIG_RPCSEC_GSS_KRB5=m
457457
CONFIG_CIFS=m
458458
# CONFIG_CIFS_STATS2 is not set
459459
# CONFIG_CIFS_DEBUG is not set
@@ -579,6 +579,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
579579
CONFIG_EARLY_PRINTK=y
580580
CONFIG_KUNIT=m
581581
CONFIG_KUNIT_ALL_TESTS=m
582+
CONFIG_TEST_DHRY=m
582583
CONFIG_TEST_MIN_HEAP=m
583584
CONFIG_TEST_DIV64=m
584585
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
208208
CONFIG_IP_NF_TARGET_NETMAP=m
209209
CONFIG_IP_NF_TARGET_REDIRECT=m
210210
CONFIG_IP_NF_MANGLE=m
211-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
212211
CONFIG_IP_NF_TARGET_ECN=m
213212
CONFIG_IP_NF_TARGET_TTL=m
214213
CONFIG_IP_NF_RAW=m
@@ -474,6 +473,7 @@ CONFIG_NFS_V4=m
474473
CONFIG_NFS_SWAP=y
475474
CONFIG_ROOT_NFS=y
476475
CONFIG_NFSD=m
476+
CONFIG_RPCSEC_GSS_KRB5=m
477477
CONFIG_CIFS=m
478478
# CONFIG_CIFS_STATS2 is not set
479479
# CONFIG_CIFS_DEBUG is not set
@@ -600,6 +600,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
600600
CONFIG_EARLY_PRINTK=y
601601
CONFIG_KUNIT=m
602602
CONFIG_KUNIT_ALL_TESTS=m
603+
CONFIG_TEST_DHRY=m
603604
CONFIG_TEST_MIN_HEAP=m
604605
CONFIG_TEST_DIV64=m
605606
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
228228
CONFIG_IP_NF_TARGET_NETMAP=m
229229
CONFIG_IP_NF_TARGET_REDIRECT=m
230230
CONFIG_IP_NF_MANGLE=m
231-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
232231
CONFIG_IP_NF_TARGET_ECN=m
233232
CONFIG_IP_NF_TARGET_TTL=m
234233
CONFIG_IP_NF_RAW=m
@@ -314,7 +313,6 @@ CONFIG_AF_KCM=m
314313
# CONFIG_WIRELESS is not set
315314
CONFIG_PSAMPLE=m
316315
CONFIG_NET_IFE=m
317-
CONFIG_PCCARD=y
318316
CONFIG_DEVTMPFS=y
319317
CONFIG_DEVTMPFS_MOUNT=y
320318
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -561,6 +559,7 @@ CONFIG_NFS_V4=m
561559
CONFIG_NFS_SWAP=y
562560
CONFIG_ROOT_NFS=y
563561
CONFIG_NFSD=m
562+
CONFIG_RPCSEC_GSS_KRB5=m
564563
CONFIG_CIFS=m
565564
# CONFIG_CIFS_STATS2 is not set
566565
# CONFIG_CIFS_DEBUG is not set
@@ -687,6 +686,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
687686
CONFIG_EARLY_PRINTK=y
688687
CONFIG_KUNIT=m
689688
CONFIG_KUNIT_ALL_TESTS=m
689+
CONFIG_TEST_DHRY=m
690690
CONFIG_TEST_MIN_HEAP=m
691691
CONFIG_TEST_DIV64=m
692692
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
206206
CONFIG_IP_NF_TARGET_NETMAP=m
207207
CONFIG_IP_NF_TARGET_REDIRECT=m
208208
CONFIG_IP_NF_MANGLE=m
209-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
210209
CONFIG_IP_NF_TARGET_ECN=m
211210
CONFIG_IP_NF_TARGET_TTL=m
212211
CONFIG_IP_NF_RAW=m
@@ -443,6 +442,7 @@ CONFIG_NFS_V4=m
443442
CONFIG_NFS_SWAP=y
444443
CONFIG_ROOT_NFS=y
445444
CONFIG_NFSD=m
445+
CONFIG_RPCSEC_GSS_KRB5=m
446446
CONFIG_CIFS=m
447447
# CONFIG_CIFS_STATS2 is not set
448448
# CONFIG_CIFS_DEBUG is not set
@@ -568,6 +568,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
568568
CONFIG_EARLY_PRINTK=y
569569
CONFIG_KUNIT=m
570570
CONFIG_KUNIT_ALL_TESTS=m
571+
CONFIG_TEST_DHRY=m
571572
CONFIG_TEST_MIN_HEAP=m
572573
CONFIG_TEST_DIV64=m
573574
CONFIG_REED_SOLOMON_TEST=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
207207
CONFIG_IP_NF_TARGET_NETMAP=m
208208
CONFIG_IP_NF_TARGET_REDIRECT=m
209209
CONFIG_IP_NF_MANGLE=m
210-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
211210
CONFIG_IP_NF_TARGET_ECN=m
212211
CONFIG_IP_NF_TARGET_TTL=m
213212
CONFIG_IP_NF_RAW=m
@@ -444,6 +443,7 @@ CONFIG_NFS_V4=m
444443
CONFIG_NFS_SWAP=y
445444
CONFIG_ROOT_NFS=y
446445
CONFIG_NFSD=m
446+
CONFIG_RPCSEC_GSS_KRB5=m
447447
CONFIG_CIFS=m
448448
# CONFIG_CIFS_STATS2 is not set
449449
# CONFIG_CIFS_DEBUG is not set
@@ -569,6 +569,7 @@ CONFIG_WW_MUTEX_SELFTEST=m
569569
CONFIG_EARLY_PRINTK=y
570570
CONFIG_KUNIT=m
571571
CONFIG_KUNIT_ALL_TESTS=m
572+
CONFIG_TEST_DHRY=m
572573
CONFIG_TEST_MIN_HEAP=m
573574
CONFIG_TEST_DIV64=m
574575
CONFIG_REED_SOLOMON_TEST=m

0 commit comments

Comments
 (0)