Skip to content

Commit 508f34f

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - Make the Zorro bus type constant - defconfig updates * tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.8-rc1 zorro: Make zorro_bus_type const
2 parents 691632f + e8a7824 commit 508f34f

14 files changed

Lines changed: 2 additions & 38 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ CONFIG_ATA=y
336336
CONFIG_PATA_GAYLE=y
337337
CONFIG_PATA_BUDDHA=y
338338
CONFIG_MD=y
339-
CONFIG_MD_LINEAR=m
340339
CONFIG_BLK_DEV_DM=m
341340
CONFIG_DM_UNSTRIPED=m
342341
CONFIG_DM_CRYPT=m
@@ -579,12 +578,10 @@ CONFIG_CRYPTO_TEA=m
579578
CONFIG_CRYPTO_TWOFISH=m
580579
CONFIG_CRYPTO_ADIANTUM=m
581580
CONFIG_CRYPTO_ARC4=m
582-
CONFIG_CRYPTO_CFB=m
583581
CONFIG_CRYPTO_CTS=m
584582
CONFIG_CRYPTO_HCTR2=m
585583
CONFIG_CRYPTO_KEYWRAP=m
586584
CONFIG_CRYPTO_LRW=m
587-
CONFIG_CRYPTO_OFB=m
588585
CONFIG_CRYPTO_PCBC=m
589586
CONFIG_CRYPTO_XTS=m
590587
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ CONFIG_SCSI_SAS_ATTRS=m
316316
CONFIG_ISCSI_TCP=m
317317
CONFIG_ISCSI_BOOT_SYSFS=m
318318
CONFIG_MD=y
319-
CONFIG_MD_LINEAR=m
320319
CONFIG_BLK_DEV_DM=m
321320
CONFIG_DM_UNSTRIPED=m
322321
CONFIG_DM_CRYPT=m
@@ -536,12 +535,10 @@ CONFIG_CRYPTO_TEA=m
536535
CONFIG_CRYPTO_TWOFISH=m
537536
CONFIG_CRYPTO_ADIANTUM=m
538537
CONFIG_CRYPTO_ARC4=m
539-
CONFIG_CRYPTO_CFB=m
540538
CONFIG_CRYPTO_CTS=m
541539
CONFIG_CRYPTO_HCTR2=m
542540
CONFIG_CRYPTO_KEYWRAP=m
543541
CONFIG_CRYPTO_LRW=m
544-
CONFIG_CRYPTO_OFB=m
545542
CONFIG_CRYPTO_PCBC=m
546543
CONFIG_CRYPTO_XTS=m
547544
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ CONFIG_ATA=y
331331
# CONFIG_ATA_BMDMA is not set
332332
CONFIG_PATA_FALCON=y
333333
CONFIG_MD=y
334-
CONFIG_MD_LINEAR=m
335334
CONFIG_BLK_DEV_DM=m
336335
CONFIG_DM_UNSTRIPED=m
337336
CONFIG_DM_CRYPT=m
@@ -556,12 +555,10 @@ CONFIG_CRYPTO_TEA=m
556555
CONFIG_CRYPTO_TWOFISH=m
557556
CONFIG_CRYPTO_ADIANTUM=m
558557
CONFIG_CRYPTO_ARC4=m
559-
CONFIG_CRYPTO_CFB=m
560558
CONFIG_CRYPTO_CTS=m
561559
CONFIG_CRYPTO_HCTR2=m
562560
CONFIG_CRYPTO_KEYWRAP=m
563561
CONFIG_CRYPTO_LRW=m
564-
CONFIG_CRYPTO_OFB=m
565562
CONFIG_CRYPTO_PCBC=m
566563
CONFIG_CRYPTO_XTS=m
567564
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ CONFIG_ISCSI_TCP=m
314314
CONFIG_ISCSI_BOOT_SYSFS=m
315315
CONFIG_BVME6000_SCSI=y
316316
CONFIG_MD=y
317-
CONFIG_MD_LINEAR=m
318317
CONFIG_BLK_DEV_DM=m
319318
CONFIG_DM_UNSTRIPED=m
320319
CONFIG_DM_CRYPT=m
@@ -528,12 +527,10 @@ CONFIG_CRYPTO_TEA=m
528527
CONFIG_CRYPTO_TWOFISH=m
529528
CONFIG_CRYPTO_ADIANTUM=m
530529
CONFIG_CRYPTO_ARC4=m
531-
CONFIG_CRYPTO_CFB=m
532530
CONFIG_CRYPTO_CTS=m
533531
CONFIG_CRYPTO_HCTR2=m
534532
CONFIG_CRYPTO_KEYWRAP=m
535533
CONFIG_CRYPTO_LRW=m
536-
CONFIG_CRYPTO_OFB=m
537534
CONFIG_CRYPTO_PCBC=m
538535
CONFIG_CRYPTO_XTS=m
539536
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ CONFIG_SCSI_SAS_ATTRS=m
315315
CONFIG_ISCSI_TCP=m
316316
CONFIG_ISCSI_BOOT_SYSFS=m
317317
CONFIG_MD=y
318-
CONFIG_MD_LINEAR=m
319318
CONFIG_BLK_DEV_DM=m
320319
CONFIG_DM_UNSTRIPED=m
321320
CONFIG_DM_CRYPT=m
@@ -538,12 +537,10 @@ CONFIG_CRYPTO_TEA=m
538537
CONFIG_CRYPTO_TWOFISH=m
539538
CONFIG_CRYPTO_ADIANTUM=m
540539
CONFIG_CRYPTO_ARC4=m
541-
CONFIG_CRYPTO_CFB=m
542540
CONFIG_CRYPTO_CTS=m
543541
CONFIG_CRYPTO_HCTR2=m
544542
CONFIG_CRYPTO_KEYWRAP=m
545543
CONFIG_CRYPTO_LRW=m
546-
CONFIG_CRYPTO_OFB=m
547544
CONFIG_CRYPTO_PCBC=m
548545
CONFIG_CRYPTO_XTS=m
549546
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ CONFIG_ATA=y
320320
# CONFIG_ATA_BMDMA is not set
321321
CONFIG_PATA_PLATFORM=y
322322
CONFIG_MD=y
323-
CONFIG_MD_LINEAR=m
324323
CONFIG_BLK_DEV_DM=m
325324
CONFIG_DM_UNSTRIPED=m
326325
CONFIG_DM_CRYPT=m
@@ -555,12 +554,10 @@ CONFIG_CRYPTO_TEA=m
555554
CONFIG_CRYPTO_TWOFISH=m
556555
CONFIG_CRYPTO_ADIANTUM=m
557556
CONFIG_CRYPTO_ARC4=m
558-
CONFIG_CRYPTO_CFB=m
559557
CONFIG_CRYPTO_CTS=m
560558
CONFIG_CRYPTO_HCTR2=m
561559
CONFIG_CRYPTO_KEYWRAP=m
562560
CONFIG_CRYPTO_LRW=m
563-
CONFIG_CRYPTO_OFB=m
564561
CONFIG_CRYPTO_PCBC=m
565562
CONFIG_CRYPTO_XTS=m
566563
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ CONFIG_PATA_GAYLE=y
363363
CONFIG_PATA_BUDDHA=y
364364
CONFIG_PATA_PLATFORM=y
365365
CONFIG_MD=y
366-
CONFIG_MD_LINEAR=m
367366
CONFIG_BLK_DEV_DM=m
368367
CONFIG_DM_UNSTRIPED=m
369368
CONFIG_DM_CRYPT=m
@@ -641,12 +640,10 @@ CONFIG_CRYPTO_TEA=m
641640
CONFIG_CRYPTO_TWOFISH=m
642641
CONFIG_CRYPTO_ADIANTUM=m
643642
CONFIG_CRYPTO_ARC4=m
644-
CONFIG_CRYPTO_CFB=m
645643
CONFIG_CRYPTO_CTS=m
646644
CONFIG_CRYPTO_HCTR2=m
647645
CONFIG_CRYPTO_KEYWRAP=m
648646
CONFIG_CRYPTO_LRW=m
649-
CONFIG_CRYPTO_OFB=m
650647
CONFIG_CRYPTO_PCBC=m
651648
CONFIG_CRYPTO_XTS=m
652649
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ CONFIG_ISCSI_TCP=m
313313
CONFIG_ISCSI_BOOT_SYSFS=m
314314
CONFIG_MVME147_SCSI=y
315315
CONFIG_MD=y
316-
CONFIG_MD_LINEAR=m
317316
CONFIG_BLK_DEV_DM=m
318317
CONFIG_DM_UNSTRIPED=m
319318
CONFIG_DM_CRYPT=m
@@ -527,12 +526,10 @@ CONFIG_CRYPTO_TEA=m
527526
CONFIG_CRYPTO_TWOFISH=m
528527
CONFIG_CRYPTO_ADIANTUM=m
529528
CONFIG_CRYPTO_ARC4=m
530-
CONFIG_CRYPTO_CFB=m
531529
CONFIG_CRYPTO_CTS=m
532530
CONFIG_CRYPTO_HCTR2=m
533531
CONFIG_CRYPTO_KEYWRAP=m
534532
CONFIG_CRYPTO_LRW=m
535-
CONFIG_CRYPTO_OFB=m
536533
CONFIG_CRYPTO_PCBC=m
537534
CONFIG_CRYPTO_XTS=m
538535
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ CONFIG_ISCSI_TCP=m
314314
CONFIG_ISCSI_BOOT_SYSFS=m
315315
CONFIG_MVME16x_SCSI=y
316316
CONFIG_MD=y
317-
CONFIG_MD_LINEAR=m
318317
CONFIG_BLK_DEV_DM=m
319318
CONFIG_DM_UNSTRIPED=m
320319
CONFIG_DM_CRYPT=m
@@ -528,12 +527,10 @@ CONFIG_CRYPTO_TEA=m
528527
CONFIG_CRYPTO_TWOFISH=m
529528
CONFIG_CRYPTO_ADIANTUM=m
530529
CONFIG_CRYPTO_ARC4=m
531-
CONFIG_CRYPTO_CFB=m
532530
CONFIG_CRYPTO_CTS=m
533531
CONFIG_CRYPTO_HCTR2=m
534532
CONFIG_CRYPTO_KEYWRAP=m
535533
CONFIG_CRYPTO_LRW=m
536-
CONFIG_CRYPTO_OFB=m
537534
CONFIG_CRYPTO_PCBC=m
538535
CONFIG_CRYPTO_XTS=m
539536
CONFIG_CRYPTO_AEGIS128=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ CONFIG_ATA=y
320320
# CONFIG_ATA_BMDMA is not set
321321
CONFIG_PATA_FALCON=y
322322
CONFIG_MD=y
323-
CONFIG_MD_LINEAR=m
324323
CONFIG_BLK_DEV_DM=m
325324
CONFIG_DM_UNSTRIPED=m
326325
CONFIG_DM_CRYPT=m
@@ -545,12 +544,10 @@ CONFIG_CRYPTO_TEA=m
545544
CONFIG_CRYPTO_TWOFISH=m
546545
CONFIG_CRYPTO_ADIANTUM=m
547546
CONFIG_CRYPTO_ARC4=m
548-
CONFIG_CRYPTO_CFB=m
549547
CONFIG_CRYPTO_CTS=m
550548
CONFIG_CRYPTO_HCTR2=m
551549
CONFIG_CRYPTO_KEYWRAP=m
552550
CONFIG_CRYPTO_LRW=m
553-
CONFIG_CRYPTO_OFB=m
554551
CONFIG_CRYPTO_PCBC=m
555552
CONFIG_CRYPTO_XTS=m
556553
CONFIG_CRYPTO_AEGIS128=m

0 commit comments

Comments
 (0)