Skip to content

Commit df68770

Browse files
torvaldstorvalds
committed
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven. * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Use for_each_sg() m68k/defconfig: Update defconfigs for v4.1-rc6
2 parents 407a2c7 + 1214c52 commit df68770

13 files changed

+84
-31
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
177177
CONFIG_IP_SET_HASH_NETIFACE=m
178178
CONFIG_IP_SET_LIST_SET=m
179179
CONFIG_NF_CONNTRACK_IPV4=m
180-
CONFIG_NF_LOG_ARP=m
181180
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
182181
CONFIG_NF_TABLES_ARP=m
182+
CONFIG_NF_LOG_ARP=m
183183
CONFIG_NFT_CHAIN_NAT_IPV4=m
184184
CONFIG_NFT_MASQ_IPV4=m
185185
CONFIG_NFT_REDIR_IPV4=m
@@ -267,7 +267,9 @@ CONFIG_BATMAN_ADV_DAT=y
267267
CONFIG_BATMAN_ADV_NC=y
268268
CONFIG_BATMAN_ADV_MCAST=y
269269
CONFIG_NETLINK_DIAG=m
270+
CONFIG_MPLS=y
270271
CONFIG_NET_MPLS_GSO=m
272+
CONFIG_MPLS_ROUTING=m
271273
# CONFIG_WIRELESS is not set
272274
# CONFIG_UEVENT_HELPER is not set
273275
CONFIG_DEVTMPFS=y
@@ -285,6 +287,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
285287
CONFIG_BLK_DEV_DRBD=m
286288
CONFIG_BLK_DEV_NBD=m
287289
CONFIG_BLK_DEV_RAM=y
290+
CONFIG_BLK_DEV_PMEM=m
288291
CONFIG_CDROM_PKTCDVD=m
289292
CONFIG_ATA_OVER_ETH=m
290293
CONFIG_DUMMY_IRQ=m
@@ -324,6 +327,7 @@ CONFIG_DM_RAID=m
324327
CONFIG_DM_ZERO=m
325328
CONFIG_DM_MULTIPATH=m
326329
CONFIG_DM_UEVENT=y
330+
CONFIG_DM_LOG_WRITES=m
327331
CONFIG_TARGET_CORE=m
328332
CONFIG_TCM_IBLOCK=m
329333
CONFIG_TCM_FILEIO=m
@@ -348,6 +352,7 @@ CONFIG_VETH=m
348352
CONFIG_A2065=y
349353
CONFIG_ARIADNE=y
350354
# CONFIG_NET_VENDOR_ARC is not set
355+
# CONFIG_NET_CADENCE is not set
351356
# CONFIG_NET_VENDOR_BROADCOM is not set
352357
# CONFIG_NET_VENDOR_CIRRUS is not set
353358
# CONFIG_NET_VENDOR_HP is not set
@@ -414,7 +419,6 @@ CONFIG_HID=m
414419
CONFIG_HIDRAW=y
415420
CONFIG_UHID=m
416421
# CONFIG_HID_GENERIC is not set
417-
# CONFIG_HID_PLANTRONICS is not set
418422
# CONFIG_USB_SUPPORT is not set
419423
CONFIG_RTC_CLASS=y
420424
CONFIG_RTC_DRV_MSM6242=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175175
CONFIG_IP_SET_HASH_NETIFACE=m
176176
CONFIG_IP_SET_LIST_SET=m
177177
CONFIG_NF_CONNTRACK_IPV4=m
178-
CONFIG_NF_LOG_ARP=m
179178
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180179
CONFIG_NF_TABLES_ARP=m
180+
CONFIG_NF_LOG_ARP=m
181181
CONFIG_NFT_CHAIN_NAT_IPV4=m
182182
CONFIG_NFT_MASQ_IPV4=m
183183
CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265265
CONFIG_BATMAN_ADV_NC=y
266266
CONFIG_BATMAN_ADV_MCAST=y
267267
CONFIG_NETLINK_DIAG=m
268+
CONFIG_MPLS=y
268269
CONFIG_NET_MPLS_GSO=m
270+
CONFIG_MPLS_ROUTING=m
269271
# CONFIG_WIRELESS is not set
270272
# CONFIG_UEVENT_HELPER is not set
271273
CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277279
CONFIG_BLK_DEV_DRBD=m
278280
CONFIG_BLK_DEV_NBD=m
279281
CONFIG_BLK_DEV_RAM=y
282+
CONFIG_BLK_DEV_PMEM=m
280283
CONFIG_CDROM_PKTCDVD=m
281284
CONFIG_ATA_OVER_ETH=m
282285
CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m
306309
CONFIG_DM_ZERO=m
307310
CONFIG_DM_MULTIPATH=m
308311
CONFIG_DM_UEVENT=y
312+
CONFIG_DM_LOG_WRITES=m
309313
CONFIG_TARGET_CORE=m
310314
CONFIG_TCM_IBLOCK=m
311315
CONFIG_TCM_FILEIO=m
@@ -327,6 +331,7 @@ CONFIG_NETCONSOLE=m
327331
CONFIG_NETCONSOLE_DYNAMIC=y
328332
CONFIG_VETH=m
329333
# CONFIG_NET_VENDOR_ARC is not set
334+
# CONFIG_NET_CADENCE is not set
330335
# CONFIG_NET_VENDOR_BROADCOM is not set
331336
# CONFIG_NET_VENDOR_INTEL is not set
332337
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -375,7 +380,6 @@ CONFIG_HID=m
375380
CONFIG_HIDRAW=y
376381
CONFIG_UHID=m
377382
# CONFIG_HID_GENERIC is not set
378-
# CONFIG_HID_PLANTRONICS is not set
379383
# CONFIG_USB_SUPPORT is not set
380384
CONFIG_RTC_CLASS=y
381385
CONFIG_RTC_DRV_GENERIC=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175175
CONFIG_IP_SET_HASH_NETIFACE=m
176176
CONFIG_IP_SET_LIST_SET=m
177177
CONFIG_NF_CONNTRACK_IPV4=m
178-
CONFIG_NF_LOG_ARP=m
179178
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180179
CONFIG_NF_TABLES_ARP=m
180+
CONFIG_NF_LOG_ARP=m
181181
CONFIG_NFT_CHAIN_NAT_IPV4=m
182182
CONFIG_NFT_MASQ_IPV4=m
183183
CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265265
CONFIG_BATMAN_ADV_NC=y
266266
CONFIG_BATMAN_ADV_MCAST=y
267267
CONFIG_NETLINK_DIAG=m
268+
CONFIG_MPLS=y
268269
CONFIG_NET_MPLS_GSO=m
270+
CONFIG_MPLS_ROUTING=m
269271
# CONFIG_WIRELESS is not set
270272
# CONFIG_UEVENT_HELPER is not set
271273
CONFIG_DEVTMPFS=y
@@ -281,6 +283,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
281283
CONFIG_BLK_DEV_DRBD=m
282284
CONFIG_BLK_DEV_NBD=m
283285
CONFIG_BLK_DEV_RAM=y
286+
CONFIG_BLK_DEV_PMEM=m
284287
CONFIG_CDROM_PKTCDVD=m
285288
CONFIG_ATA_OVER_ETH=m
286289
CONFIG_DUMMY_IRQ=m
@@ -315,6 +318,7 @@ CONFIG_DM_RAID=m
315318
CONFIG_DM_ZERO=m
316319
CONFIG_DM_MULTIPATH=m
317320
CONFIG_DM_UEVENT=y
321+
CONFIG_DM_LOG_WRITES=m
318322
CONFIG_TARGET_CORE=m
319323
CONFIG_TCM_IBLOCK=m
320324
CONFIG_TCM_FILEIO=m
@@ -337,6 +341,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
337341
CONFIG_VETH=m
338342
CONFIG_ATARILANCE=y
339343
# CONFIG_NET_VENDOR_ARC is not set
344+
# CONFIG_NET_CADENCE is not set
340345
# CONFIG_NET_VENDOR_BROADCOM is not set
341346
# CONFIG_NET_VENDOR_INTEL is not set
342347
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -391,7 +396,6 @@ CONFIG_DMASOUND_ATARI=m
391396
CONFIG_HID=m
392397
CONFIG_HIDRAW=y
393398
CONFIG_UHID=m
394-
# CONFIG_HID_PLANTRONICS is not set
395399
CONFIG_RTC_CLASS=y
396400
CONFIG_RTC_DRV_GENERIC=m
397401
# CONFIG_IOMMU_SUPPORT is not set

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
173173
CONFIG_IP_SET_HASH_NETIFACE=m
174174
CONFIG_IP_SET_LIST_SET=m
175175
CONFIG_NF_CONNTRACK_IPV4=m
176-
CONFIG_NF_LOG_ARP=m
177176
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
178177
CONFIG_NF_TABLES_ARP=m
178+
CONFIG_NF_LOG_ARP=m
179179
CONFIG_NFT_CHAIN_NAT_IPV4=m
180180
CONFIG_NFT_MASQ_IPV4=m
181181
CONFIG_NFT_REDIR_IPV4=m
@@ -263,7 +263,9 @@ CONFIG_BATMAN_ADV_DAT=y
263263
CONFIG_BATMAN_ADV_NC=y
264264
CONFIG_BATMAN_ADV_MCAST=y
265265
CONFIG_NETLINK_DIAG=m
266+
CONFIG_MPLS=y
266267
CONFIG_NET_MPLS_GSO=m
268+
CONFIG_MPLS_ROUTING=m
267269
# CONFIG_WIRELESS is not set
268270
# CONFIG_UEVENT_HELPER is not set
269271
CONFIG_DEVTMPFS=y
@@ -275,6 +277,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
275277
CONFIG_BLK_DEV_DRBD=m
276278
CONFIG_BLK_DEV_NBD=m
277279
CONFIG_BLK_DEV_RAM=y
280+
CONFIG_BLK_DEV_PMEM=m
278281
CONFIG_CDROM_PKTCDVD=m
279282
CONFIG_ATA_OVER_ETH=m
280283
CONFIG_DUMMY_IRQ=m
@@ -305,6 +308,7 @@ CONFIG_DM_RAID=m
305308
CONFIG_DM_ZERO=m
306309
CONFIG_DM_MULTIPATH=m
307310
CONFIG_DM_UEVENT=y
311+
CONFIG_DM_LOG_WRITES=m
308312
CONFIG_TARGET_CORE=m
309313
CONFIG_TCM_IBLOCK=m
310314
CONFIG_TCM_FILEIO=m
@@ -326,6 +330,7 @@ CONFIG_NETCONSOLE=m
326330
CONFIG_NETCONSOLE_DYNAMIC=y
327331
CONFIG_VETH=m
328332
# CONFIG_NET_VENDOR_ARC is not set
333+
# CONFIG_NET_CADENCE is not set
329334
# CONFIG_NET_VENDOR_BROADCOM is not set
330335
CONFIG_BVME6000_NET=y
331336
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -369,7 +374,6 @@ CONFIG_HID=m
369374
CONFIG_HIDRAW=y
370375
CONFIG_UHID=m
371376
# CONFIG_HID_GENERIC is not set
372-
# CONFIG_HID_PLANTRONICS is not set
373377
# CONFIG_USB_SUPPORT is not set
374378
CONFIG_RTC_CLASS=y
375379
CONFIG_RTC_DRV_GENERIC=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175175
CONFIG_IP_SET_HASH_NETIFACE=m
176176
CONFIG_IP_SET_LIST_SET=m
177177
CONFIG_NF_CONNTRACK_IPV4=m
178-
CONFIG_NF_LOG_ARP=m
179178
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180179
CONFIG_NF_TABLES_ARP=m
180+
CONFIG_NF_LOG_ARP=m
181181
CONFIG_NFT_CHAIN_NAT_IPV4=m
182182
CONFIG_NFT_MASQ_IPV4=m
183183
CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265265
CONFIG_BATMAN_ADV_NC=y
266266
CONFIG_BATMAN_ADV_MCAST=y
267267
CONFIG_NETLINK_DIAG=m
268+
CONFIG_MPLS=y
268269
CONFIG_NET_MPLS_GSO=m
270+
CONFIG_MPLS_ROUTING=m
269271
# CONFIG_WIRELESS is not set
270272
# CONFIG_UEVENT_HELPER is not set
271273
CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277279
CONFIG_BLK_DEV_DRBD=m
278280
CONFIG_BLK_DEV_NBD=m
279281
CONFIG_BLK_DEV_RAM=y
282+
CONFIG_BLK_DEV_PMEM=m
280283
CONFIG_CDROM_PKTCDVD=m
281284
CONFIG_ATA_OVER_ETH=m
282285
CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m
306309
CONFIG_DM_ZERO=m
307310
CONFIG_DM_MULTIPATH=m
308311
CONFIG_DM_UEVENT=y
312+
CONFIG_DM_LOG_WRITES=m
309313
CONFIG_TARGET_CORE=m
310314
CONFIG_TCM_IBLOCK=m
311315
CONFIG_TCM_FILEIO=m
@@ -328,6 +332,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
328332
CONFIG_VETH=m
329333
CONFIG_HPLANCE=y
330334
# CONFIG_NET_VENDOR_ARC is not set
335+
# CONFIG_NET_CADENCE is not set
331336
# CONFIG_NET_VENDOR_BROADCOM is not set
332337
# CONFIG_NET_VENDOR_INTEL is not set
333338
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -378,7 +383,6 @@ CONFIG_HID=m
378383
CONFIG_HIDRAW=y
379384
CONFIG_UHID=m
380385
# CONFIG_HID_GENERIC is not set
381-
# CONFIG_HID_PLANTRONICS is not set
382386
# CONFIG_USB_SUPPORT is not set
383387
CONFIG_RTC_CLASS=y
384388
CONFIG_RTC_DRV_GENERIC=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
174174
CONFIG_IP_SET_HASH_NETIFACE=m
175175
CONFIG_IP_SET_LIST_SET=m
176176
CONFIG_NF_CONNTRACK_IPV4=m
177-
CONFIG_NF_LOG_ARP=m
178177
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
179178
CONFIG_NF_TABLES_ARP=m
179+
CONFIG_NF_LOG_ARP=m
180180
CONFIG_NFT_CHAIN_NAT_IPV4=m
181181
CONFIG_NFT_MASQ_IPV4=m
182182
CONFIG_NFT_REDIR_IPV4=m
@@ -267,7 +267,9 @@ CONFIG_BATMAN_ADV_DAT=y
267267
CONFIG_BATMAN_ADV_NC=y
268268
CONFIG_BATMAN_ADV_MCAST=y
269269
CONFIG_NETLINK_DIAG=m
270+
CONFIG_MPLS=y
270271
CONFIG_NET_MPLS_GSO=m
272+
CONFIG_MPLS_ROUTING=m
271273
# CONFIG_WIRELESS is not set
272274
# CONFIG_UEVENT_HELPER is not set
273275
CONFIG_DEVTMPFS=y
@@ -280,6 +282,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
280282
CONFIG_BLK_DEV_DRBD=m
281283
CONFIG_BLK_DEV_NBD=m
282284
CONFIG_BLK_DEV_RAM=y
285+
CONFIG_BLK_DEV_PMEM=m
283286
CONFIG_CDROM_PKTCDVD=m
284287
CONFIG_ATA_OVER_ETH=m
285288
CONFIG_DUMMY_IRQ=m
@@ -315,6 +318,7 @@ CONFIG_DM_RAID=m
315318
CONFIG_DM_ZERO=m
316319
CONFIG_DM_MULTIPATH=m
317320
CONFIG_DM_UEVENT=y
321+
CONFIG_DM_LOG_WRITES=m
318322
CONFIG_TARGET_CORE=m
319323
CONFIG_TCM_IBLOCK=m
320324
CONFIG_TCM_FILEIO=m
@@ -344,6 +348,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
344348
CONFIG_VETH=m
345349
CONFIG_MACMACE=y
346350
# CONFIG_NET_VENDOR_ARC is not set
351+
# CONFIG_NET_CADENCE is not set
347352
# CONFIG_NET_VENDOR_BROADCOM is not set
348353
CONFIG_MAC89x0=y
349354
# CONFIG_NET_VENDOR_INTEL is not set
@@ -400,7 +405,6 @@ CONFIG_HID=m
400405
CONFIG_HIDRAW=y
401406
CONFIG_UHID=m
402407
# CONFIG_HID_GENERIC is not set
403-
# CONFIG_HID_PLANTRONICS is not set
404408
# CONFIG_USB_SUPPORT is not set
405409
CONFIG_RTC_CLASS=y
406410
CONFIG_RTC_DRV_GENERIC=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
184184
CONFIG_IP_SET_HASH_NETIFACE=m
185185
CONFIG_IP_SET_LIST_SET=m
186186
CONFIG_NF_CONNTRACK_IPV4=m
187-
CONFIG_NF_LOG_ARP=m
188187
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
189188
CONFIG_NF_TABLES_ARP=m
189+
CONFIG_NF_LOG_ARP=m
190190
CONFIG_NFT_CHAIN_NAT_IPV4=m
191191
CONFIG_NFT_MASQ_IPV4=m
192192
CONFIG_NFT_REDIR_IPV4=m
@@ -277,7 +277,9 @@ CONFIG_BATMAN_ADV_DAT=y
277277
CONFIG_BATMAN_ADV_NC=y
278278
CONFIG_BATMAN_ADV_MCAST=y
279279
CONFIG_NETLINK_DIAG=m
280+
CONFIG_MPLS=y
280281
CONFIG_NET_MPLS_GSO=m
282+
CONFIG_MPLS_ROUTING=m
281283
# CONFIG_WIRELESS is not set
282284
# CONFIG_UEVENT_HELPER is not set
283285
CONFIG_DEVTMPFS=y
@@ -299,6 +301,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
299301
CONFIG_BLK_DEV_DRBD=m
300302
CONFIG_BLK_DEV_NBD=m
301303
CONFIG_BLK_DEV_RAM=y
304+
CONFIG_BLK_DEV_PMEM=m
302305
CONFIG_CDROM_PKTCDVD=m
303306
CONFIG_ATA_OVER_ETH=m
304307
CONFIG_DUMMY_IRQ=m
@@ -348,6 +351,7 @@ CONFIG_DM_RAID=m
348351
CONFIG_DM_ZERO=m
349352
CONFIG_DM_MULTIPATH=m
350353
CONFIG_DM_UEVENT=y
354+
CONFIG_DM_LOG_WRITES=m
351355
CONFIG_TARGET_CORE=m
352356
CONFIG_TCM_IBLOCK=m
353357
CONFIG_TCM_FILEIO=m
@@ -384,6 +388,7 @@ CONFIG_MVME147_NET=y
384388
CONFIG_SUN3LANCE=y
385389
CONFIG_MACMACE=y
386390
# CONFIG_NET_VENDOR_ARC is not set
391+
# CONFIG_NET_CADENCE is not set
387392
# CONFIG_NET_VENDOR_BROADCOM is not set
388393
CONFIG_MAC89x0=y
389394
# CONFIG_NET_VENDOR_HP is not set
@@ -468,7 +473,6 @@ CONFIG_HID=m
468473
CONFIG_HIDRAW=y
469474
CONFIG_UHID=m
470475
# CONFIG_HID_GENERIC is not set
471-
# CONFIG_HID_PLANTRONICS is not set
472476
# CONFIG_USB_SUPPORT is not set
473477
CONFIG_RTC_CLASS=y
474478
CONFIG_RTC_DRV_MSM6242=m

0 commit comments

Comments
 (0)