Skip to content

Commit c94cf02

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v6.14-rc1
 - Drop CONFIG_DM_KUNIT_TEST=m (auto-modular since commit 55b7aee ("drivers: base: test: Enable device model tests with KUNIT_ALL_TESTS")), - Re-enable modular build of MD Linear (append) mode (revived in commit 127186c ("md: reintroduce md-linear"). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/be6ac546f7b98eae352584daacc42a58577dc224.1738589762.git.geert@linux-m68k.org
1 parent 3c4e4ec commit c94cf02

12 files changed

+12
-12
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ CONFIG_NET_IFE=m
299299
CONFIG_DEVTMPFS=y
300300
CONFIG_DEVTMPFS_MOUNT=y
301301
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
302-
CONFIG_DM_KUNIT_TEST=m
303302
CONFIG_CONNECTOR=m
304303
CONFIG_PARPORT=m
305304
CONFIG_PARPORT_AMIGA=m
@@ -336,6 +335,7 @@ CONFIG_ATA=y
336335
CONFIG_PATA_GAYLE=y
337336
CONFIG_PATA_BUDDHA=y
338337
CONFIG_MD=y
338+
CONFIG_MD_LINEAR=m
339339
CONFIG_BLK_DEV_DM=m
340340
CONFIG_DM_UNSTRIPED=m
341341
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ CONFIG_NET_IFE=m
295295
CONFIG_DEVTMPFS=y
296296
CONFIG_DEVTMPFS_MOUNT=y
297297
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
298-
CONFIG_DM_KUNIT_TEST=m
299298
CONFIG_CONNECTOR=m
300299
CONFIG_ZRAM=m
301300
CONFIG_BLK_DEV_LOOP=y
@@ -316,6 +315,7 @@ CONFIG_SCSI_SAS_ATTRS=m
316315
CONFIG_ISCSI_TCP=m
317316
CONFIG_ISCSI_BOOT_SYSFS=m
318317
CONFIG_MD=y
318+
CONFIG_MD_LINEAR=m
319319
CONFIG_BLK_DEV_DM=m
320320
CONFIG_DM_UNSTRIPED=m
321321
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ CONFIG_NET_IFE=m
302302
CONFIG_DEVTMPFS=y
303303
CONFIG_DEVTMPFS_MOUNT=y
304304
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
305-
CONFIG_DM_KUNIT_TEST=m
306305
CONFIG_CONNECTOR=m
307306
CONFIG_PARPORT=m
308307
CONFIG_PARPORT_ATARI=m
@@ -331,6 +330,7 @@ CONFIG_ATA=y
331330
# CONFIG_ATA_BMDMA is not set
332331
CONFIG_PATA_FALCON=y
333332
CONFIG_MD=y
333+
CONFIG_MD_LINEAR=m
334334
CONFIG_BLK_DEV_DM=m
335335
CONFIG_DM_UNSTRIPED=m
336336
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ CONFIG_NET_IFE=m
292292
CONFIG_DEVTMPFS=y
293293
CONFIG_DEVTMPFS_MOUNT=y
294294
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
295-
CONFIG_DM_KUNIT_TEST=m
296295
CONFIG_CONNECTOR=m
297296
CONFIG_ZRAM=m
298297
CONFIG_BLK_DEV_LOOP=y
@@ -314,6 +313,7 @@ CONFIG_ISCSI_TCP=m
314313
CONFIG_ISCSI_BOOT_SYSFS=m
315314
CONFIG_BVME6000_SCSI=y
316315
CONFIG_MD=y
316+
CONFIG_MD_LINEAR=m
317317
CONFIG_BLK_DEV_DM=m
318318
CONFIG_DM_UNSTRIPED=m
319319
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ CONFIG_NET_IFE=m
294294
CONFIG_DEVTMPFS=y
295295
CONFIG_DEVTMPFS_MOUNT=y
296296
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
297-
CONFIG_DM_KUNIT_TEST=m
298297
CONFIG_CONNECTOR=m
299298
CONFIG_ZRAM=m
300299
CONFIG_BLK_DEV_LOOP=y
@@ -315,6 +314,7 @@ CONFIG_SCSI_SAS_ATTRS=m
315314
CONFIG_ISCSI_TCP=m
316315
CONFIG_ISCSI_BOOT_SYSFS=m
317316
CONFIG_MD=y
317+
CONFIG_MD_LINEAR=m
318318
CONFIG_BLK_DEV_DM=m
319319
CONFIG_DM_UNSTRIPED=m
320320
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ CONFIG_NET_IFE=m
293293
CONFIG_DEVTMPFS=y
294294
CONFIG_DEVTMPFS_MOUNT=y
295295
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
296-
CONFIG_DM_KUNIT_TEST=m
297296
CONFIG_CONNECTOR=m
298297
CONFIG_BLK_DEV_SWIM=m
299298
CONFIG_ZRAM=m
@@ -320,6 +319,7 @@ CONFIG_ATA=y
320319
# CONFIG_ATA_BMDMA is not set
321320
CONFIG_PATA_PLATFORM=y
322321
CONFIG_MD=y
322+
CONFIG_MD_LINEAR=m
323323
CONFIG_BLK_DEV_DM=m
324324
CONFIG_DM_UNSTRIPED=m
325325
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ CONFIG_NET_IFE=m
313313
CONFIG_DEVTMPFS=y
314314
CONFIG_DEVTMPFS_MOUNT=y
315315
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316-
CONFIG_DM_KUNIT_TEST=m
317316
CONFIG_CONNECTOR=m
318317
CONFIG_PARPORT=m
319318
CONFIG_PARPORT_PC=m
@@ -363,6 +362,7 @@ CONFIG_PATA_GAYLE=y
363362
CONFIG_PATA_BUDDHA=y
364363
CONFIG_PATA_PLATFORM=y
365364
CONFIG_MD=y
365+
CONFIG_MD_LINEAR=m
366366
CONFIG_BLK_DEV_DM=m
367367
CONFIG_DM_UNSTRIPED=m
368368
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ CONFIG_NET_IFE=m
291291
CONFIG_DEVTMPFS=y
292292
CONFIG_DEVTMPFS_MOUNT=y
293293
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
294-
CONFIG_DM_KUNIT_TEST=m
295294
CONFIG_CONNECTOR=m
296295
CONFIG_ZRAM=m
297296
CONFIG_BLK_DEV_LOOP=y
@@ -313,6 +312,7 @@ CONFIG_ISCSI_TCP=m
313312
CONFIG_ISCSI_BOOT_SYSFS=m
314313
CONFIG_MVME147_SCSI=y
315314
CONFIG_MD=y
315+
CONFIG_MD_LINEAR=m
316316
CONFIG_BLK_DEV_DM=m
317317
CONFIG_DM_UNSTRIPED=m
318318
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ CONFIG_NET_IFE=m
292292
CONFIG_DEVTMPFS=y
293293
CONFIG_DEVTMPFS_MOUNT=y
294294
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
295-
CONFIG_DM_KUNIT_TEST=m
296295
CONFIG_CONNECTOR=m
297296
CONFIG_ZRAM=m
298297
CONFIG_BLK_DEV_LOOP=y
@@ -314,6 +313,7 @@ CONFIG_ISCSI_TCP=m
314313
CONFIG_ISCSI_BOOT_SYSFS=m
315314
CONFIG_MVME16x_SCSI=y
316315
CONFIG_MD=y
316+
CONFIG_MD_LINEAR=m
317317
CONFIG_BLK_DEV_DM=m
318318
CONFIG_DM_UNSTRIPED=m
319319
CONFIG_DM_CRYPT=m

‎arch/m68k/configs/q40_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ CONFIG_NET_IFE=m
293293
CONFIG_DEVTMPFS=y
294294
CONFIG_DEVTMPFS_MOUNT=y
295295
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
296-
CONFIG_DM_KUNIT_TEST=m
297296
CONFIG_CONNECTOR=m
298297
CONFIG_PARPORT=m
299298
CONFIG_PARPORT_PC=m
@@ -320,6 +319,7 @@ CONFIG_ATA=y
320319
# CONFIG_ATA_BMDMA is not set
321320
CONFIG_PATA_FALCON=y
322321
CONFIG_MD=y
322+
CONFIG_MD_LINEAR=m
323323
CONFIG_BLK_DEV_DM=m
324324
CONFIG_DM_UNSTRIPED=m
325325
CONFIG_DM_CRYPT=m

0 commit comments

Comments
 (0)