Skip to content

Commit 3cf1d6a

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - make the NuBus bus type static and constant - defconfig updates * tag 'm68k-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.7-rc1 nubus: Make nubus_bus_type static and constant
2 parents 968b803 + 6b9c045 commit 3cf1d6a

14 files changed

Lines changed: 13 additions & 22 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ CONFIG_REISERFS_FS=m
453453
CONFIG_JFS_FS=m
454454
CONFIG_OCFS2_FS=m
455455
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
456+
CONFIG_BCACHEFS_FS=m
456457
CONFIG_FANOTIFY=y
457458
CONFIG_QUOTA_NETLINK_INTERFACE=y
458459
CONFIG_AUTOFS_FS=m
@@ -550,7 +551,6 @@ CONFIG_NLS_MAC_TURKISH=m
550551
CONFIG_DLM=m
551552
CONFIG_ENCRYPTED_KEYS=m
552553
CONFIG_HARDENED_USERCOPY=y
553-
CONFIG_CRYPTO_MANAGER=y
554554
CONFIG_CRYPTO_USER=m
555555
CONFIG_CRYPTO_CRYPTD=m
556556
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ CONFIG_REISERFS_FS=m
410410
CONFIG_JFS_FS=m
411411
CONFIG_OCFS2_FS=m
412412
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
413+
CONFIG_BCACHEFS_FS=m
413414
CONFIG_FANOTIFY=y
414415
CONFIG_QUOTA_NETLINK_INTERFACE=y
415416
CONFIG_AUTOFS_FS=m
@@ -507,7 +508,6 @@ CONFIG_NLS_MAC_TURKISH=m
507508
CONFIG_DLM=m
508509
CONFIG_ENCRYPTED_KEYS=m
509510
CONFIG_HARDENED_USERCOPY=y
510-
CONFIG_CRYPTO_MANAGER=y
511511
CONFIG_CRYPTO_USER=m
512512
CONFIG_CRYPTO_CRYPTD=m
513513
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ CONFIG_REISERFS_FS=m
430430
CONFIG_JFS_FS=m
431431
CONFIG_OCFS2_FS=m
432432
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
433+
CONFIG_BCACHEFS_FS=m
433434
CONFIG_FANOTIFY=y
434435
CONFIG_QUOTA_NETLINK_INTERFACE=y
435436
CONFIG_AUTOFS_FS=m
@@ -527,7 +528,6 @@ CONFIG_NLS_MAC_TURKISH=m
527528
CONFIG_DLM=m
528529
CONFIG_ENCRYPTED_KEYS=m
529530
CONFIG_HARDENED_USERCOPY=y
530-
CONFIG_CRYPTO_MANAGER=y
531531
CONFIG_CRYPTO_USER=m
532532
CONFIG_CRYPTO_CRYPTD=m
533533
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
402402
CONFIG_JFS_FS=m
403403
CONFIG_OCFS2_FS=m
404404
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
405+
CONFIG_BCACHEFS_FS=m
405406
CONFIG_FANOTIFY=y
406407
CONFIG_QUOTA_NETLINK_INTERFACE=y
407408
CONFIG_AUTOFS_FS=m
@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
499500
CONFIG_DLM=m
500501
CONFIG_ENCRYPTED_KEYS=m
501502
CONFIG_HARDENED_USERCOPY=y
502-
CONFIG_CRYPTO_MANAGER=y
503503
CONFIG_CRYPTO_USER=m
504504
CONFIG_CRYPTO_CRYPTD=m
505505
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ CONFIG_REISERFS_FS=m
412412
CONFIG_JFS_FS=m
413413
CONFIG_OCFS2_FS=m
414414
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
415+
CONFIG_BCACHEFS_FS=m
415416
CONFIG_FANOTIFY=y
416417
CONFIG_QUOTA_NETLINK_INTERFACE=y
417418
CONFIG_AUTOFS_FS=m
@@ -509,7 +510,6 @@ CONFIG_NLS_MAC_TURKISH=m
509510
CONFIG_DLM=m
510511
CONFIG_ENCRYPTED_KEYS=m
511512
CONFIG_HARDENED_USERCOPY=y
512-
CONFIG_CRYPTO_MANAGER=y
513513
CONFIG_CRYPTO_USER=m
514514
CONFIG_CRYPTO_CRYPTD=m
515515
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ CONFIG_RDS_TCP=m
269269
CONFIG_L2TP=m
270270
CONFIG_BRIDGE=m
271271
CONFIG_ATALK=m
272-
CONFIG_DEV_APPLETALK=m
273-
CONFIG_IPDDP=m
274-
CONFIG_IPDDP_ENCAP=y
275272
CONFIG_6LOWPAN=m
276273
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
277274
CONFIG_6LOWPAN_GHC_UDP=m
@@ -432,6 +429,7 @@ CONFIG_REISERFS_FS=m
432429
CONFIG_JFS_FS=m
433430
CONFIG_OCFS2_FS=m
434431
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
432+
CONFIG_BCACHEFS_FS=m
435433
CONFIG_FANOTIFY=y
436434
CONFIG_QUOTA_NETLINK_INTERFACE=y
437435
CONFIG_AUTOFS_FS=m
@@ -529,7 +527,6 @@ CONFIG_NLS_MAC_TURKISH=m
529527
CONFIG_DLM=m
530528
CONFIG_ENCRYPTED_KEYS=m
531529
CONFIG_HARDENED_USERCOPY=y
532-
CONFIG_CRYPTO_MANAGER=y
533530
CONFIG_CRYPTO_USER=m
534531
CONFIG_CRYPTO_CRYPTD=m
535532
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,6 @@ CONFIG_RDS_TCP=m
289289
CONFIG_L2TP=m
290290
CONFIG_BRIDGE=m
291291
CONFIG_ATALK=m
292-
CONFIG_DEV_APPLETALK=m
293-
CONFIG_IPDDP=m
294-
CONFIG_IPDDP_ENCAP=y
295292
CONFIG_6LOWPAN=m
296293
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
297294
CONFIG_6LOWPAN_GHC_UDP=m
@@ -518,6 +515,7 @@ CONFIG_REISERFS_FS=m
518515
CONFIG_JFS_FS=m
519516
CONFIG_OCFS2_FS=m
520517
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
518+
CONFIG_BCACHEFS_FS=m
521519
CONFIG_FANOTIFY=y
522520
CONFIG_QUOTA_NETLINK_INTERFACE=y
523521
CONFIG_AUTOFS_FS=m
@@ -615,7 +613,6 @@ CONFIG_NLS_MAC_TURKISH=m
615613
CONFIG_DLM=m
616614
CONFIG_ENCRYPTED_KEYS=m
617615
CONFIG_HARDENED_USERCOPY=y
618-
CONFIG_CRYPTO_MANAGER=y
619616
CONFIG_CRYPTO_USER=m
620617
CONFIG_CRYPTO_CRYPTD=m
621618
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ CONFIG_REISERFS_FS=m
401401
CONFIG_JFS_FS=m
402402
CONFIG_OCFS2_FS=m
403403
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
404+
CONFIG_BCACHEFS_FS=m
404405
CONFIG_FANOTIFY=y
405406
CONFIG_QUOTA_NETLINK_INTERFACE=y
406407
CONFIG_AUTOFS_FS=m
@@ -498,7 +499,6 @@ CONFIG_NLS_MAC_TURKISH=m
498499
CONFIG_DLM=m
499500
CONFIG_ENCRYPTED_KEYS=m
500501
CONFIG_HARDENED_USERCOPY=y
501-
CONFIG_CRYPTO_MANAGER=y
502502
CONFIG_CRYPTO_USER=m
503503
CONFIG_CRYPTO_CRYPTD=m
504504
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
402402
CONFIG_JFS_FS=m
403403
CONFIG_OCFS2_FS=m
404404
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
405+
CONFIG_BCACHEFS_FS=m
405406
CONFIG_FANOTIFY=y
406407
CONFIG_QUOTA_NETLINK_INTERFACE=y
407408
CONFIG_AUTOFS_FS=m
@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
499500
CONFIG_DLM=m
500501
CONFIG_ENCRYPTED_KEYS=m
501502
CONFIG_HARDENED_USERCOPY=y
502-
CONFIG_CRYPTO_MANAGER=y
503503
CONFIG_CRYPTO_USER=m
504504
CONFIG_CRYPTO_CRYPTD=m
505505
CONFIG_CRYPTO_TEST=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ CONFIG_REISERFS_FS=m
419419
CONFIG_JFS_FS=m
420420
CONFIG_OCFS2_FS=m
421421
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
422+
CONFIG_BCACHEFS_FS=m
422423
CONFIG_FANOTIFY=y
423424
CONFIG_QUOTA_NETLINK_INTERFACE=y
424425
CONFIG_AUTOFS_FS=m
@@ -516,7 +517,6 @@ CONFIG_NLS_MAC_TURKISH=m
516517
CONFIG_DLM=m
517518
CONFIG_ENCRYPTED_KEYS=m
518519
CONFIG_HARDENED_USERCOPY=y
519-
CONFIG_CRYPTO_MANAGER=y
520520
CONFIG_CRYPTO_USER=m
521521
CONFIG_CRYPTO_CRYPTD=m
522522
CONFIG_CRYPTO_TEST=m

0 commit comments

Comments
 (0)