Skip to content

Commit 1a0ae06

Browse files
committed
m68k: defconfig: Update defconfigs for v5.16-rc1
- Drop CONFIG_MCTP=m (can no longer be modular since commit 78476d3 ("mctp: Add flow extension to skb")), - Drop CONFIG_BLK_DEV_CRYPTOLOOP=m (removed in commit 47e9624 ("block: remove support for cryptoloop and the xor transfer")). Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 376e3fd commit 1a0ae06

12 files changed

+0
-24
lines changed

arch/m68k/configs/amiga_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ CONFIG_MPLS_ROUTING=m
302302
CONFIG_MPLS_IPTUNNEL=m
303303
CONFIG_NET_NSH=m
304304
CONFIG_AF_KCM=m
305-
CONFIG_MCTP=m
306305
# CONFIG_WIRELESS is not set
307306
CONFIG_PSAMPLE=m
308307
CONFIG_NET_IFE=m
@@ -317,7 +316,6 @@ CONFIG_PARPORT_1284=y
317316
CONFIG_AMIGA_FLOPPY=y
318317
CONFIG_AMIGA_Z2RAM=y
319318
CONFIG_BLK_DEV_LOOP=y
320-
CONFIG_BLK_DEV_CRYPTOLOOP=m
321319
CONFIG_BLK_DEV_DRBD=m
322320
CONFIG_BLK_DEV_NBD=m
323321
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/apollo_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ CONFIG_MPLS_ROUTING=m
298298
CONFIG_MPLS_IPTUNNEL=m
299299
CONFIG_NET_NSH=m
300300
CONFIG_AF_KCM=m
301-
CONFIG_MCTP=m
302301
# CONFIG_WIRELESS is not set
303302
CONFIG_PSAMPLE=m
304303
CONFIG_NET_IFE=m
@@ -307,7 +306,6 @@ CONFIG_DEVTMPFS_MOUNT=y
307306
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
308307
CONFIG_CONNECTOR=m
309308
CONFIG_BLK_DEV_LOOP=y
310-
CONFIG_BLK_DEV_CRYPTOLOOP=m
311309
CONFIG_BLK_DEV_DRBD=m
312310
CONFIG_BLK_DEV_NBD=m
313311
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/atari_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ CONFIG_MPLS_ROUTING=m
305305
CONFIG_MPLS_IPTUNNEL=m
306306
CONFIG_NET_NSH=m
307307
CONFIG_AF_KCM=m
308-
CONFIG_MCTP=m
309308
# CONFIG_WIRELESS is not set
310309
CONFIG_PSAMPLE=m
311310
CONFIG_NET_IFE=m
@@ -318,7 +317,6 @@ CONFIG_PARPORT_ATARI=m
318317
CONFIG_PARPORT_1284=y
319318
CONFIG_ATARI_FLOPPY=y
320319
CONFIG_BLK_DEV_LOOP=y
321-
CONFIG_BLK_DEV_CRYPTOLOOP=m
322320
CONFIG_BLK_DEV_DRBD=m
323321
CONFIG_BLK_DEV_NBD=m
324322
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/bvme6000_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ CONFIG_MPLS_ROUTING=m
295295
CONFIG_MPLS_IPTUNNEL=m
296296
CONFIG_NET_NSH=m
297297
CONFIG_AF_KCM=m
298-
CONFIG_MCTP=m
299298
# CONFIG_WIRELESS is not set
300299
CONFIG_PSAMPLE=m
301300
CONFIG_NET_IFE=m
@@ -304,7 +303,6 @@ CONFIG_DEVTMPFS_MOUNT=y
304303
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
305304
CONFIG_CONNECTOR=m
306305
CONFIG_BLK_DEV_LOOP=y
307-
CONFIG_BLK_DEV_CRYPTOLOOP=m
308306
CONFIG_BLK_DEV_DRBD=m
309307
CONFIG_BLK_DEV_NBD=m
310308
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/hp300_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ CONFIG_MPLS_ROUTING=m
297297
CONFIG_MPLS_IPTUNNEL=m
298298
CONFIG_NET_NSH=m
299299
CONFIG_AF_KCM=m
300-
CONFIG_MCTP=m
301300
# CONFIG_WIRELESS is not set
302301
CONFIG_PSAMPLE=m
303302
CONFIG_NET_IFE=m
@@ -306,7 +305,6 @@ CONFIG_DEVTMPFS_MOUNT=y
306305
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
307306
CONFIG_CONNECTOR=m
308307
CONFIG_BLK_DEV_LOOP=y
309-
CONFIG_BLK_DEV_CRYPTOLOOP=m
310308
CONFIG_BLK_DEV_DRBD=m
311309
CONFIG_BLK_DEV_NBD=m
312310
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/mac_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ CONFIG_MPLS_ROUTING=m
299299
CONFIG_MPLS_IPTUNNEL=m
300300
CONFIG_NET_NSH=m
301301
CONFIG_AF_KCM=m
302-
CONFIG_MCTP=m
303302
# CONFIG_WIRELESS is not set
304303
CONFIG_PSAMPLE=m
305304
CONFIG_NET_IFE=m
@@ -309,7 +308,6 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m
309308
CONFIG_CONNECTOR=m
310309
CONFIG_BLK_DEV_SWIM=m
311310
CONFIG_BLK_DEV_LOOP=y
312-
CONFIG_BLK_DEV_CRYPTOLOOP=m
313311
CONFIG_BLK_DEV_DRBD=m
314312
CONFIG_BLK_DEV_NBD=m
315313
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/multi_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ CONFIG_MPLS_ROUTING=m
319319
CONFIG_MPLS_IPTUNNEL=m
320320
CONFIG_NET_NSH=m
321321
CONFIG_AF_KCM=m
322-
CONFIG_MCTP=m
323322
# CONFIG_WIRELESS is not set
324323
CONFIG_PSAMPLE=m
325324
CONFIG_NET_IFE=m
@@ -338,7 +337,6 @@ CONFIG_ATARI_FLOPPY=y
338337
CONFIG_BLK_DEV_SWIM=m
339338
CONFIG_AMIGA_Z2RAM=y
340339
CONFIG_BLK_DEV_LOOP=y
341-
CONFIG_BLK_DEV_CRYPTOLOOP=m
342340
CONFIG_BLK_DEV_DRBD=m
343341
CONFIG_BLK_DEV_NBD=m
344342
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/mvme147_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ CONFIG_MPLS_ROUTING=m
294294
CONFIG_MPLS_IPTUNNEL=m
295295
CONFIG_NET_NSH=m
296296
CONFIG_AF_KCM=m
297-
CONFIG_MCTP=m
298297
# CONFIG_WIRELESS is not set
299298
CONFIG_PSAMPLE=m
300299
CONFIG_NET_IFE=m
@@ -303,7 +302,6 @@ CONFIG_DEVTMPFS_MOUNT=y
303302
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
304303
CONFIG_CONNECTOR=m
305304
CONFIG_BLK_DEV_LOOP=y
306-
CONFIG_BLK_DEV_CRYPTOLOOP=m
307305
CONFIG_BLK_DEV_DRBD=m
308306
CONFIG_BLK_DEV_NBD=m
309307
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/mvme16x_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ CONFIG_MPLS_ROUTING=m
295295
CONFIG_MPLS_IPTUNNEL=m
296296
CONFIG_NET_NSH=m
297297
CONFIG_AF_KCM=m
298-
CONFIG_MCTP=m
299298
# CONFIG_WIRELESS is not set
300299
CONFIG_PSAMPLE=m
301300
CONFIG_NET_IFE=m
@@ -304,7 +303,6 @@ CONFIG_DEVTMPFS_MOUNT=y
304303
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
305304
CONFIG_CONNECTOR=m
306305
CONFIG_BLK_DEV_LOOP=y
307-
CONFIG_BLK_DEV_CRYPTOLOOP=m
308306
CONFIG_BLK_DEV_DRBD=m
309307
CONFIG_BLK_DEV_NBD=m
310308
CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/q40_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ CONFIG_MPLS_ROUTING=m
296296
CONFIG_MPLS_IPTUNNEL=m
297297
CONFIG_NET_NSH=m
298298
CONFIG_AF_KCM=m
299-
CONFIG_MCTP=m
300299
# CONFIG_WIRELESS is not set
301300
CONFIG_PSAMPLE=m
302301
CONFIG_NET_IFE=m
@@ -308,7 +307,6 @@ CONFIG_PARPORT=m
308307
CONFIG_PARPORT_PC=m
309308
CONFIG_PARPORT_1284=y
310309
CONFIG_BLK_DEV_LOOP=y
311-
CONFIG_BLK_DEV_CRYPTOLOOP=m
312310
CONFIG_BLK_DEV_DRBD=m
313311
CONFIG_BLK_DEV_NBD=m
314312
CONFIG_BLK_DEV_RAM=y

0 commit comments

Comments
 (0)