aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 16:27:24 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 16:27:24 -0500
commitab0475df5ce45d80a9e5f056cbad3a58e4930206 (patch)
tree053912870c86d7bbec54f107215c8c7bbb04806a
parent3e8c04eb117445d67ae2b83e08bec4005129356a (diff)
parent4436820a98cdaf497a874323095e328831030956 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "Summary: - switch to asm-generic/futex.h - various cleanups - defconfig updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/defconfig: Enable Ethernet bridging m68k/defconfig: Enable Atari EtherNAT and EtherNEC Ethernet support m68k/defconfig: Enable automounting of devtmpfs at /dev m68k/defconfig: Enable early printk support m68k/defconfig: Enable test modules m68k/defconfig: Refresh defconfigs for v3.16-rc1--v3.19-rc2 m68k/atari: Remove obsolete IRQ_TYPE_* sound: dmasound_atari: Remove obsolete IRQ_TYPE_SLOW video: atafb: Remove obsolete IRQ_TYPE_PRIO parport: parport_atari: Remove obsolete IRQ_TYPE_SLOW net: atarilance: Remove obsolete IRQ_TYPE_PRIO m68k/atari: Remove obsolete keyboard_tasklet scheduling m68k/mac: Fix scsi_type for Mac LC and similar models m68k: Switch to asm-generic/futex.h m68k/mvme147: config.c - Remove unused functions m68k/atari: atakeyb.c - Remove some unused functions m68k/mvme16x: rtc - Don't use module_init in non-modular code
Diffstat
-rw-r--r--arch/m68k/atari/atakeyb.c72
-rw-r--r--arch/m68k/atari/stdma.c2
-rw-r--r--arch/m68k/atari/time.c3
-rw-r--r--arch/m68k/configs/amiga_defconfig73
-rw-r--r--arch/m68k/configs/apollo_defconfig73
-rw-r--r--arch/m68k/configs/atari_defconfig78
-rw-r--r--arch/m68k/configs/bvme6000_defconfig73
-rw-r--r--arch/m68k/configs/hp300_defconfig73
-rw-r--r--arch/m68k/configs/mac_defconfig72
-rw-r--r--arch/m68k/configs/multi_defconfig78
-rw-r--r--arch/m68k/configs/mvme147_defconfig73
-rw-r--r--arch/m68k/configs/mvme16x_defconfig72
-rw-r--r--arch/m68k/configs/q40_defconfig73
-rw-r--r--arch/m68k/configs/sun3_defconfig72
-rw-r--r--arch/m68k/configs/sun3x_defconfig73
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/m68k/include/asm/atariints.h5
-rw-r--r--arch/m68k/include/asm/futex.h94
-rw-r--r--arch/m68k/include/asm/macintosh.h2
-rw-r--r--arch/m68k/mac/config.c32
-rw-r--r--arch/m68k/mvme147/config.c46
-rw-r--r--arch/m68k/mvme16x/rtc.c2
-rw-r--r--drivers/net/ethernet/amd/atarilance.c8
-rw-r--r--drivers/parport/parport_atari.c4
-rw-r--r--drivers/video/fbdev/atafb.c3
-rw-r--r--sound/oss/dmasound/dmasound_atari.c2
26 files changed, 782 insertions, 377 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 95022b04b62d..264db1126803 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -170,7 +170,6 @@ repeat:
170 if (acia_stat & ACIA_RDRF) { 170 if (acia_stat & ACIA_RDRF) {
171 /* received a character */ 171 /* received a character */
172 scancode = acia.key_data; /* get it or reset the ACIA, I'll get it! */ 172 scancode = acia.key_data; /* get it or reset the ACIA, I'll get it! */
173 tasklet_schedule(&keyboard_tasklet);
174 interpret_scancode: 173 interpret_scancode:
175 switch (kb_state.state) { 174 switch (kb_state.state) {
176 case KEYBOARD: 175 case KEYBOARD:
@@ -430,14 +429,6 @@ void ikbd_mouse_y0_top(void)
430} 429}
431EXPORT_SYMBOL(ikbd_mouse_y0_top); 430EXPORT_SYMBOL(ikbd_mouse_y0_top);
432 431
433/* Resume */
434void ikbd_resume(void)
435{
436 static const char cmd[1] = { 0x11 };
437
438 ikbd_write(cmd, 1);
439}
440
441/* Disable mouse */ 432/* Disable mouse */
442void ikbd_mouse_disable(void) 433void ikbd_mouse_disable(void)
443{ 434{
@@ -447,14 +438,6 @@ void ikbd_mouse_disable(void)
447} 438}
448EXPORT_SYMBOL(ikbd_mouse_disable); 439EXPORT_SYMBOL(ikbd_mouse_disable);
449 440
450/* Pause output */
451void ikbd_pause(void)
452{
453 static const char cmd[1] = { 0x13 };
454
455 ikbd_write(cmd, 1);
456}
457
458/* Set joystick event reporting */ 441/* Set joystick event reporting */
459void ikbd_joystick_event_on(void) 442void ikbd_joystick_event_on(void)
460{ 443{
@@ -502,56 +485,6 @@ void ikbd_joystick_disable(void)
502 ikbd_write(cmd, 1); 485 ikbd_write(cmd, 1);
503} 486}
504 487
505/* Time-of-day clock set */
506void ikbd_clock_set(int year, int month, int day, int hour, int minute, int second)
507{
508 char cmd[7] = { 0x1B, year, month, day, hour, minute, second };
509
510 ikbd_write(cmd, 7);
511}
512
513/* Interrogate time-of-day clock */
514void ikbd_clock_get(int *year, int *month, int *day, int *hour, int *minute, int second)
515{
516 static const char cmd[1] = { 0x1C };
517
518 ikbd_write(cmd, 1);
519}
520
521/* Memory load */
522void ikbd_mem_write(int address, int size, char *data)
523{
524 panic("Attempt to write data into keyboard memory");
525}
526
527/* Memory read */
528void ikbd_mem_read(int address, char data[6])
529{
530 char cmd[3] = { 0x21, address>>8, address&0xFF };
531
532 ikbd_write(cmd, 3);
533
534 /* receive data and put it in data */
535}
536
537/* Controller execute */
538void ikbd_exec(int address)
539{
540 char cmd[3] = { 0x22, address>>8, address&0xFF };
541
542 ikbd_write(cmd, 3);
543}
544
545/* Status inquiries (0x87-0x9A) not yet implemented */
546
547/* Set the state of the caps lock led. */
548void atari_kbd_leds(unsigned int leds)
549{
550 char cmd[6] = {32, 0, 4, 1, 254 + ((leds & 4) != 0), 0};
551
552 ikbd_write(cmd, 6);
553}
554
555/* 488/*
556 * The original code sometimes left the interrupt line of 489 * The original code sometimes left the interrupt line of
557 * the ACIAs low forever. I hope, it is fixed now. 490 * the ACIAs low forever. I hope, it is fixed now.
@@ -571,9 +504,8 @@ int atari_keyb_init(void)
571 kb_state.state = KEYBOARD; 504 kb_state.state = KEYBOARD;
572 kb_state.len = 0; 505 kb_state.len = 0;
573 506
574 error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 507 error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 0,
575 IRQ_TYPE_SLOW, "keyboard,mouse,MIDI", 508 "keyboard,mouse,MIDI", atari_keyboard_interrupt);
576 atari_keyboard_interrupt);
577 if (error) 509 if (error)
578 return error; 510 return error;
579 511
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
index e5a66596b116..ba65f942d0c7 100644
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(stdma_islocked);
198void __init stdma_init(void) 198void __init stdma_init(void)
199{ 199{
200 stdma_isr = NULL; 200 stdma_isr = NULL;
201 if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, 201 if (request_irq(IRQ_MFP_FDC, stdma_int, IRQF_SHARED,
202 "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int)) 202 "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int))
203 pr_err("Couldn't register ST-DMA interrupt\n"); 203 pr_err("Couldn't register ST-DMA interrupt\n");
204} 204}
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index da8f981c36d6..c549b48174ec 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -32,8 +32,7 @@ atari_sched_init(irq_handler_t timer_routine)
32 /* start timer C, div = 1:100 */ 32 /* start timer C, div = 1:100 */
33 st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60; 33 st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
34 /* install interrupt service routine for MFP Timer C */ 34 /* install interrupt service routine for MFP Timer C */
35 if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW, 35 if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))
36 "timer", timer_routine))
37 pr_err("Couldn't register timer interrupt\n"); 36 pr_err("Couldn't register timer interrupt\n");
38} 37}
39 38
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 399df883c8bb..1a10a08ebec7 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -36,6 +36,7 @@ CONFIG_AMIGA_PCMCIA=y
36CONFIG_ZORRO_NAMES=y 36CONFIG_ZORRO_NAMES=y
37# CONFIG_COMPACTION is not set 37# CONFIG_COMPACTION is not set
38CONFIG_CLEANCACHE=y 38CONFIG_CLEANCACHE=y
39CONFIG_ZPOOL=m
39# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 40# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40CONFIG_BINFMT_AOUT=m 41CONFIG_BINFMT_AOUT=m
41CONFIG_BINFMT_MISC=m 42CONFIG_BINFMT_MISC=m
@@ -55,6 +56,8 @@ CONFIG_NET_IPIP=m
55CONFIG_NET_IPGRE_DEMUX=m 56CONFIG_NET_IPGRE_DEMUX=m
56CONFIG_NET_IPGRE=m 57CONFIG_NET_IPGRE=m
57CONFIG_NET_IPVTI=m 58CONFIG_NET_IPVTI=m
59CONFIG_NET_FOU_IP_TUNNELS=y
60CONFIG_GENEVE=m
58CONFIG_INET_AH=m 61CONFIG_INET_AH=m
59CONFIG_INET_ESP=m 62CONFIG_INET_ESP=m
60CONFIG_INET_IPCOMP=m 63CONFIG_INET_IPCOMP=m
@@ -96,6 +99,8 @@ CONFIG_NFT_HASH=m
96CONFIG_NFT_COUNTER=m 99CONFIG_NFT_COUNTER=m
97CONFIG_NFT_LOG=m 100CONFIG_NFT_LOG=m
98CONFIG_NFT_LIMIT=m 101CONFIG_NFT_LIMIT=m
102CONFIG_NFT_MASQ=m
103CONFIG_NFT_REDIR=m
99CONFIG_NFT_NAT=m 104CONFIG_NFT_NAT=m
100CONFIG_NFT_QUEUE=m 105CONFIG_NFT_QUEUE=m
101CONFIG_NFT_REJECT=m 106CONFIG_NFT_REJECT=m
@@ -142,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
142CONFIG_NETFILTER_XT_MATCH_OSF=m 147CONFIG_NETFILTER_XT_MATCH_OSF=m
143CONFIG_NETFILTER_XT_MATCH_OWNER=m 148CONFIG_NETFILTER_XT_MATCH_OWNER=m
144CONFIG_NETFILTER_XT_MATCH_POLICY=m 149CONFIG_NETFILTER_XT_MATCH_POLICY=m
150CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
145CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 151CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
146CONFIG_NETFILTER_XT_MATCH_QUOTA=m 152CONFIG_NETFILTER_XT_MATCH_QUOTA=m
147CONFIG_NETFILTER_XT_MATCH_RATEEST=m 153CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -163,6 +169,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
163CONFIG_IP_SET_HASH_IPPORT=m 169CONFIG_IP_SET_HASH_IPPORT=m
164CONFIG_IP_SET_HASH_IPPORTIP=m 170CONFIG_IP_SET_HASH_IPPORTIP=m
165CONFIG_IP_SET_HASH_IPPORTNET=m 171CONFIG_IP_SET_HASH_IPPORTNET=m
172CONFIG_IP_SET_HASH_MAC=m
166CONFIG_IP_SET_HASH_NETPORTNET=m 173CONFIG_IP_SET_HASH_NETPORTNET=m
167CONFIG_IP_SET_HASH_NET=m 174CONFIG_IP_SET_HASH_NET=m
168CONFIG_IP_SET_HASH_NETNET=m 175CONFIG_IP_SET_HASH_NETNET=m
@@ -170,9 +177,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
170CONFIG_IP_SET_HASH_NETIFACE=m 177CONFIG_IP_SET_HASH_NETIFACE=m
171CONFIG_IP_SET_LIST_SET=m 178CONFIG_IP_SET_LIST_SET=m
172CONFIG_NF_CONNTRACK_IPV4=m 179CONFIG_NF_CONNTRACK_IPV4=m
180CONFIG_NF_LOG_ARP=m
173CONFIG_NFT_CHAIN_ROUTE_IPV4=m 181CONFIG_NFT_CHAIN_ROUTE_IPV4=m
174CONFIG_NFT_CHAIN_NAT_IPV4=m
175CONFIG_NF_TABLES_ARP=m 182CONFIG_NF_TABLES_ARP=m
183CONFIG_NFT_CHAIN_NAT_IPV4=m
184CONFIG_NFT_MASQ_IPV4=m
185CONFIG_NFT_REDIR_IPV4=m
176CONFIG_IP_NF_IPTABLES=m 186CONFIG_IP_NF_IPTABLES=m
177CONFIG_IP_NF_MATCH_AH=m 187CONFIG_IP_NF_MATCH_AH=m
178CONFIG_IP_NF_MATCH_ECN=m 188CONFIG_IP_NF_MATCH_ECN=m
@@ -181,8 +191,7 @@ CONFIG_IP_NF_MATCH_TTL=m
181CONFIG_IP_NF_FILTER=m 191CONFIG_IP_NF_FILTER=m
182CONFIG_IP_NF_TARGET_REJECT=m 192CONFIG_IP_NF_TARGET_REJECT=m
183CONFIG_IP_NF_TARGET_SYNPROXY=m 193CONFIG_IP_NF_TARGET_SYNPROXY=m
184CONFIG_IP_NF_TARGET_ULOG=m 194CONFIG_IP_NF_NAT=m
185CONFIG_NF_NAT_IPV4=m
186CONFIG_IP_NF_TARGET_MASQUERADE=m 195CONFIG_IP_NF_TARGET_MASQUERADE=m
187CONFIG_IP_NF_TARGET_NETMAP=m 196CONFIG_IP_NF_TARGET_NETMAP=m
188CONFIG_IP_NF_TARGET_REDIRECT=m 197CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -197,6 +206,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
197CONFIG_NF_CONNTRACK_IPV6=m 206CONFIG_NF_CONNTRACK_IPV6=m
198CONFIG_NFT_CHAIN_ROUTE_IPV6=m 207CONFIG_NFT_CHAIN_ROUTE_IPV6=m
199CONFIG_NFT_CHAIN_NAT_IPV6=m 208CONFIG_NFT_CHAIN_NAT_IPV6=m
209CONFIG_NFT_MASQ_IPV6=m
210CONFIG_NFT_REDIR_IPV6=m
200CONFIG_IP6_NF_IPTABLES=m 211CONFIG_IP6_NF_IPTABLES=m
201CONFIG_IP6_NF_MATCH_AH=m 212CONFIG_IP6_NF_MATCH_AH=m
202CONFIG_IP6_NF_MATCH_EUI64=m 213CONFIG_IP6_NF_MATCH_EUI64=m
@@ -213,17 +224,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
213CONFIG_IP6_NF_TARGET_SYNPROXY=m 224CONFIG_IP6_NF_TARGET_SYNPROXY=m
214CONFIG_IP6_NF_MANGLE=m 225CONFIG_IP6_NF_MANGLE=m
215CONFIG_IP6_NF_RAW=m 226CONFIG_IP6_NF_RAW=m
216CONFIG_NF_NAT_IPV6=m 227CONFIG_IP6_NF_NAT=m
217CONFIG_IP6_NF_TARGET_MASQUERADE=m 228CONFIG_IP6_NF_TARGET_MASQUERADE=m
218CONFIG_IP6_NF_TARGET_NPT=m 229CONFIG_IP6_NF_TARGET_NPT=m
219CONFIG_NF_TABLES_BRIDGE=m 230CONFIG_NF_TABLES_BRIDGE=m
231CONFIG_NFT_BRIDGE_META=m
232CONFIG_NFT_BRIDGE_REJECT=m
233CONFIG_NF_LOG_BRIDGE=m
234CONFIG_BRIDGE_NF_EBTABLES=m
235CONFIG_BRIDGE_EBT_BROUTE=m
236CONFIG_BRIDGE_EBT_T_FILTER=m
237CONFIG_BRIDGE_EBT_T_NAT=m
238CONFIG_BRIDGE_EBT_802_3=m
239CONFIG_BRIDGE_EBT_AMONG=m
240CONFIG_BRIDGE_EBT_ARP=m
241CONFIG_BRIDGE_EBT_IP=m
242CONFIG_BRIDGE_EBT_IP6=m
243CONFIG_BRIDGE_EBT_LIMIT=m
244CONFIG_BRIDGE_EBT_MARK=m
245CONFIG_BRIDGE_EBT_PKTTYPE=m
246CONFIG_BRIDGE_EBT_STP=m
247CONFIG_BRIDGE_EBT_VLAN=m
248CONFIG_BRIDGE_EBT_ARPREPLY=m
249CONFIG_BRIDGE_EBT_DNAT=m
250CONFIG_BRIDGE_EBT_MARK_T=m
251CONFIG_BRIDGE_EBT_REDIRECT=m
252CONFIG_BRIDGE_EBT_SNAT=m
253CONFIG_BRIDGE_EBT_LOG=m
254CONFIG_BRIDGE_EBT_NFLOG=m
220CONFIG_IP_DCCP=m 255CONFIG_IP_DCCP=m
221# CONFIG_IP_DCCP_CCID3 is not set 256# CONFIG_IP_DCCP_CCID3 is not set
222CONFIG_SCTP_COOKIE_HMAC_SHA1=y 257CONFIG_SCTP_COOKIE_HMAC_SHA1=y
223CONFIG_RDS=m 258CONFIG_RDS=m
224CONFIG_RDS_TCP=m 259CONFIG_RDS_TCP=m
225CONFIG_L2TP=m 260CONFIG_L2TP=m
261CONFIG_BRIDGE=m
226CONFIG_ATALK=m 262CONFIG_ATALK=m
263CONFIG_6LOWPAN=m
227CONFIG_DNS_RESOLVER=y 264CONFIG_DNS_RESOLVER=y
228CONFIG_BATMAN_ADV=m 265CONFIG_BATMAN_ADV=m
229CONFIG_BATMAN_ADV_DAT=y 266CONFIG_BATMAN_ADV_DAT=y
@@ -232,9 +269,10 @@ CONFIG_BATMAN_ADV_MCAST=y
232CONFIG_NETLINK_DIAG=m 269CONFIG_NETLINK_DIAG=m
233CONFIG_NET_MPLS_GSO=m 270CONFIG_NET_MPLS_GSO=m
234# CONFIG_WIRELESS is not set 271# CONFIG_WIRELESS is not set
272# CONFIG_UEVENT_HELPER is not set
235CONFIG_DEVTMPFS=y 273CONFIG_DEVTMPFS=y
274CONFIG_DEVTMPFS_MOUNT=y
236# CONFIG_FIRMWARE_IN_KERNEL is not set 275# CONFIG_FIRMWARE_IN_KERNEL is not set
237# CONFIG_FW_LOADER_USER_HELPER is not set
238CONFIG_CONNECTOR=m 276CONFIG_CONNECTOR=m
239CONFIG_PARPORT=m 277CONFIG_PARPORT=m
240CONFIG_PARPORT_AMIGA=m 278CONFIG_PARPORT_AMIGA=m
@@ -299,6 +337,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
299CONFIG_NET_TEAM_MODE_RANDOM=m 337CONFIG_NET_TEAM_MODE_RANDOM=m
300CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 338CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
301CONFIG_NET_TEAM_MODE_LOADBALANCE=m 339CONFIG_NET_TEAM_MODE_LOADBALANCE=m
340CONFIG_MACVLAN=m
341CONFIG_MACVTAP=m
342CONFIG_IPVLAN=m
302CONFIG_VXLAN=m 343CONFIG_VXLAN=m
303CONFIG_NETCONSOLE=m 344CONFIG_NETCONSOLE=m
304CONFIG_NETCONSOLE_DYNAMIC=y 345CONFIG_NETCONSOLE_DYNAMIC=y
@@ -316,6 +357,8 @@ CONFIG_ARIADNE=y
316CONFIG_HYDRA=y 357CONFIG_HYDRA=y
317CONFIG_APNE=y 358CONFIG_APNE=y
318CONFIG_ZORRO8390=y 359CONFIG_ZORRO8390=y
360# CONFIG_NET_VENDOR_QUALCOMM is not set
361# CONFIG_NET_VENDOR_ROCKER is not set
319# CONFIG_NET_VENDOR_SAMSUNG is not set 362# CONFIG_NET_VENDOR_SAMSUNG is not set
320# CONFIG_NET_VENDOR_SEEQ is not set 363# CONFIG_NET_VENDOR_SEEQ is not set
321# CONFIG_NET_VENDOR_SMSC is not set 364# CONFIG_NET_VENDOR_SMSC is not set
@@ -371,6 +414,7 @@ CONFIG_HID=m
371CONFIG_HIDRAW=y 414CONFIG_HIDRAW=y
372CONFIG_UHID=m 415CONFIG_UHID=m
373# CONFIG_HID_GENERIC is not set 416# CONFIG_HID_GENERIC is not set
417# CONFIG_HID_PLANTRONICS is not set
374# CONFIG_USB_SUPPORT is not set 418# CONFIG_USB_SUPPORT is not set
375CONFIG_RTC_CLASS=y 419CONFIG_RTC_CLASS=y
376CONFIG_RTC_DRV_MSM6242=m 420CONFIG_RTC_DRV_MSM6242=m
@@ -392,6 +436,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
392CONFIG_AUTOFS4_FS=m 436CONFIG_AUTOFS4_FS=m
393CONFIG_FUSE_FS=m 437CONFIG_FUSE_FS=m
394CONFIG_CUSE=m 438CONFIG_CUSE=m
439CONFIG_OVERLAY_FS=m
395CONFIG_ISO9660_FS=y 440CONFIG_ISO9660_FS=y
396CONFIG_JOLIET=y 441CONFIG_JOLIET=y
397CONFIG_ZISOFS=y 442CONFIG_ZISOFS=y
@@ -407,6 +452,7 @@ CONFIG_HFS_FS=m
407CONFIG_HFSPLUS_FS=m 452CONFIG_HFSPLUS_FS=m
408CONFIG_CRAMFS=m 453CONFIG_CRAMFS=m
409CONFIG_SQUASHFS=m 454CONFIG_SQUASHFS=m
455CONFIG_SQUASHFS_LZ4=y
410CONFIG_SQUASHFS_LZO=y 456CONFIG_SQUASHFS_LZO=y
411CONFIG_MINIX_FS=m 457CONFIG_MINIX_FS=m
412CONFIG_OMFS_FS=m 458CONFIG_OMFS_FS=m
@@ -476,10 +522,18 @@ CONFIG_DLM=m
476CONFIG_MAGIC_SYSRQ=y 522CONFIG_MAGIC_SYSRQ=y
477CONFIG_ASYNC_RAID6_TEST=m 523CONFIG_ASYNC_RAID6_TEST=m
478CONFIG_TEST_STRING_HELPERS=m 524CONFIG_TEST_STRING_HELPERS=m
525CONFIG_TEST_KSTRTOX=m
526CONFIG_TEST_LKM=m
527CONFIG_TEST_USER_COPY=m
528CONFIG_TEST_BPF=m
529CONFIG_TEST_FIRMWARE=m
530CONFIG_TEST_UDELAY=m
531CONFIG_EARLY_PRINTK=y
479CONFIG_ENCRYPTED_KEYS=m 532CONFIG_ENCRYPTED_KEYS=m
480CONFIG_CRYPTO_MANAGER=y 533CONFIG_CRYPTO_MANAGER=y
481CONFIG_CRYPTO_USER=m 534CONFIG_CRYPTO_USER=m
482CONFIG_CRYPTO_CRYPTD=m 535CONFIG_CRYPTO_CRYPTD=m
536CONFIG_CRYPTO_MCRYPTD=m
483CONFIG_CRYPTO_TEST=m 537CONFIG_CRYPTO_TEST=m
484CONFIG_CRYPTO_CCM=m 538CONFIG_CRYPTO_CCM=m
485CONFIG_CRYPTO_GCM=m 539CONFIG_CRYPTO_GCM=m
@@ -514,13 +568,10 @@ CONFIG_CRYPTO_LZO=m
514CONFIG_CRYPTO_LZ4=m 568CONFIG_CRYPTO_LZ4=m
515CONFIG_CRYPTO_LZ4HC=m 569CONFIG_CRYPTO_LZ4HC=m
516# CONFIG_CRYPTO_ANSI_CPRNG is not set 570# CONFIG_CRYPTO_ANSI_CPRNG is not set
571CONFIG_CRYPTO_DRBG_MENU=m
572CONFIG_CRYPTO_DRBG_HASH=y
573CONFIG_CRYPTO_DRBG_CTR=y
517CONFIG_CRYPTO_USER_API_HASH=m 574CONFIG_CRYPTO_USER_API_HASH=m
518CONFIG_CRYPTO_USER_API_SKCIPHER=m 575CONFIG_CRYPTO_USER_API_SKCIPHER=m
519# CONFIG_CRYPTO_HW is not set 576# CONFIG_CRYPTO_HW is not set
520CONFIG_XZ_DEC_X86=y
521CONFIG_XZ_DEC_POWERPC=y
522CONFIG_XZ_DEC_IA64=y
523CONFIG_XZ_DEC_ARM=y
524CONFIG_XZ_DEC_ARMTHUMB=y
525CONFIG_XZ_DEC_SPARC=y
526CONFIG_XZ_DEC_TEST=m 577CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index be16740c0749..7859a738c81e 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -34,6 +34,7 @@ CONFIG_M68060=y
34CONFIG_APOLLO=y 34CONFIG_APOLLO=y
35# CONFIG_COMPACTION is not set 35# CONFIG_COMPACTION is not set
36CONFIG_CLEANCACHE=y 36CONFIG_CLEANCACHE=y
37CONFIG_ZPOOL=m
37# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
38CONFIG_BINFMT_AOUT=m 39CONFIG_BINFMT_AOUT=m
39CONFIG_BINFMT_MISC=m 40CONFIG_BINFMT_MISC=m
@@ -53,6 +54,8 @@ CONFIG_NET_IPIP=m
53CONFIG_NET_IPGRE_DEMUX=m 54CONFIG_NET_IPGRE_DEMUX=m
54CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
55CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m
56CONFIG_INET_AH=m 59CONFIG_INET_AH=m
57CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
58CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -94,6 +97,8 @@ CONFIG_NFT_HASH=m
94CONFIG_NFT_COUNTER=m 97CONFIG_NFT_COUNTER=m
95CONFIG_NFT_LOG=m 98CONFIG_NFT_LOG=m
96CONFIG_NFT_LIMIT=m 99CONFIG_NFT_LIMIT=m
100CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m
97CONFIG_NFT_NAT=m 102CONFIG_NFT_NAT=m
98CONFIG_NFT_QUEUE=m 103CONFIG_NFT_QUEUE=m
99CONFIG_NFT_REJECT=m 104CONFIG_NFT_REJECT=m
@@ -140,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
140CONFIG_NETFILTER_XT_MATCH_OSF=m 145CONFIG_NETFILTER_XT_MATCH_OSF=m
141CONFIG_NETFILTER_XT_MATCH_OWNER=m 146CONFIG_NETFILTER_XT_MATCH_OWNER=m
142CONFIG_NETFILTER_XT_MATCH_POLICY=m 147CONFIG_NETFILTER_XT_MATCH_POLICY=m
148CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
143CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 149CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
144CONFIG_NETFILTER_XT_MATCH_QUOTA=m 150CONFIG_NETFILTER_XT_MATCH_QUOTA=m
145CONFIG_NETFILTER_XT_MATCH_RATEEST=m 151CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -161,6 +167,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
161CONFIG_IP_SET_HASH_IPPORT=m 167CONFIG_IP_SET_HASH_IPPORT=m
162CONFIG_IP_SET_HASH_IPPORTIP=m 168CONFIG_IP_SET_HASH_IPPORTIP=m
163CONFIG_IP_SET_HASH_IPPORTNET=m 169CONFIG_IP_SET_HASH_IPPORTNET=m
170CONFIG_IP_SET_HASH_MAC=m
164CONFIG_IP_SET_HASH_NETPORTNET=m 171CONFIG_IP_SET_HASH_NETPORTNET=m
165CONFIG_IP_SET_HASH_NET=m 172CONFIG_IP_SET_HASH_NET=m
166CONFIG_IP_SET_HASH_NETNET=m 173CONFIG_IP_SET_HASH_NETNET=m
@@ -168,9 +175,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
168CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
169CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
170CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
171CONFIG_NFT_CHAIN_ROUTE_IPV4=m 179CONFIG_NFT_CHAIN_ROUTE_IPV4=m
172CONFIG_NFT_CHAIN_NAT_IPV4=m
173CONFIG_NF_TABLES_ARP=m 180CONFIG_NF_TABLES_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m
174CONFIG_IP_NF_IPTABLES=m 184CONFIG_IP_NF_IPTABLES=m
175CONFIG_IP_NF_MATCH_AH=m 185CONFIG_IP_NF_MATCH_AH=m
176CONFIG_IP_NF_MATCH_ECN=m 186CONFIG_IP_NF_MATCH_ECN=m
@@ -179,8 +189,7 @@ CONFIG_IP_NF_MATCH_TTL=m
179CONFIG_IP_NF_FILTER=m 189CONFIG_IP_NF_FILTER=m
180CONFIG_IP_NF_TARGET_REJECT=m 190CONFIG_IP_NF_TARGET_REJECT=m
181CONFIG_IP_NF_TARGET_SYNPROXY=m 191CONFIG_IP_NF_TARGET_SYNPROXY=m
182CONFIG_IP_NF_TARGET_ULOG=m 192CONFIG_IP_NF_NAT=m
183CONFIG_NF_NAT_IPV4=m
184CONFIG_IP_NF_TARGET_MASQUERADE=m 193CONFIG_IP_NF_TARGET_MASQUERADE=m
185CONFIG_IP_NF_TARGET_NETMAP=m 194CONFIG_IP_NF_TARGET_NETMAP=m
186CONFIG_IP_NF_TARGET_REDIRECT=m 195CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -195,6 +204,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
195CONFIG_NF_CONNTRACK_IPV6=m 204CONFIG_NF_CONNTRACK_IPV6=m
196CONFIG_NFT_CHAIN_ROUTE_IPV6=m 205CONFIG_NFT_CHAIN_ROUTE_IPV6=m
197CONFIG_NFT_CHAIN_NAT_IPV6=m 206CONFIG_NFT_CHAIN_NAT_IPV6=m
207CONFIG_NFT_MASQ_IPV6=m
208CONFIG_NFT_REDIR_IPV6=m
198CONFIG_IP6_NF_IPTABLES=m 209CONFIG_IP6_NF_IPTABLES=m
199CONFIG_IP6_NF_MATCH_AH=m 210CONFIG_IP6_NF_MATCH_AH=m
200CONFIG_IP6_NF_MATCH_EUI64=m 211CONFIG_IP6_NF_MATCH_EUI64=m
@@ -211,17 +222,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
211CONFIG_IP6_NF_TARGET_SYNPROXY=m 222CONFIG_IP6_NF_TARGET_SYNPROXY=m
212CONFIG_IP6_NF_MANGLE=m 223CONFIG_IP6_NF_MANGLE=m
213CONFIG_IP6_NF_RAW=m 224CONFIG_IP6_NF_RAW=m
214CONFIG_NF_NAT_IPV6=m 225CONFIG_IP6_NF_NAT=m
215CONFIG_IP6_NF_TARGET_MASQUERADE=m 226CONFIG_IP6_NF_TARGET_MASQUERADE=m
216CONFIG_IP6_NF_TARGET_NPT=m 227CONFIG_IP6_NF_TARGET_NPT=m
217CONFIG_NF_TABLES_BRIDGE=m 228CONFIG_NF_TABLES_BRIDGE=m
229CONFIG_NFT_BRIDGE_META=m
230CONFIG_NFT_BRIDGE_REJECT=m
231CONFIG_NF_LOG_BRIDGE=m
232CONFIG_BRIDGE_NF_EBTABLES=m
233CONFIG_BRIDGE_EBT_BROUTE=m
234CONFIG_BRIDGE_EBT_T_FILTER=m
235CONFIG_BRIDGE_EBT_T_NAT=m
236CONFIG_BRIDGE_EBT_802_3=m
237CONFIG_BRIDGE_EBT_AMONG=m
238CONFIG_BRIDGE_EBT_ARP=m
239CONFIG_BRIDGE_EBT_IP=m
240CONFIG_BRIDGE_EBT_IP6=m
241CONFIG_BRIDGE_EBT_LIMIT=m
242CONFIG_BRIDGE_EBT_MARK=m
243CONFIG_BRIDGE_EBT_PKTTYPE=m
244CONFIG_BRIDGE_EBT_STP=m
245CONFIG_BRIDGE_EBT_VLAN=m
246CONFIG_BRIDGE_EBT_ARPREPLY=m
247CONFIG_BRIDGE_EBT_DNAT=m
248CONFIG_BRIDGE_EBT_MARK_T=m
249CONFIG_BRIDGE_EBT_REDIRECT=m
250CONFIG_BRIDGE_EBT_SNAT=m
251CONFIG_BRIDGE_EBT_LOG=m
252CONFIG_BRIDGE_EBT_NFLOG=m
218CONFIG_IP_DCCP=m 253CONFIG_IP_DCCP=m
219# CONFIG_IP_DCCP_CCID3 is not set 254# CONFIG_IP_DCCP_CCID3 is not set
220CONFIG_SCTP_COOKIE_HMAC_SHA1=y 255CONFIG_SCTP_COOKIE_HMAC_SHA1=y
221CONFIG_RDS=m 256CONFIG_RDS=m
222CONFIG_RDS_TCP=m 257CONFIG_RDS_TCP=m
223CONFIG_L2TP=m 258CONFIG_L2TP=m
259CONFIG_BRIDGE=m
224CONFIG_ATALK=m 260CONFIG_ATALK=m
261CONFIG_6LOWPAN=m
225CONFIG_DNS_RESOLVER=y 262CONFIG_DNS_RESOLVER=y
226CONFIG_BATMAN_ADV=m 263CONFIG_BATMAN_ADV=m
227CONFIG_BATMAN_ADV_DAT=y 264CONFIG_BATMAN_ADV_DAT=y
@@ -230,9 +267,10 @@ CONFIG_BATMAN_ADV_MCAST=y
230CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
231CONFIG_NET_MPLS_GSO=m 268CONFIG_NET_MPLS_GSO=m
232# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set
233CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
272CONFIG_DEVTMPFS_MOUNT=y
234# CONFIG_FIRMWARE_IN_KERNEL is not set 273# CONFIG_FIRMWARE_IN_KERNEL is not set
235# CONFIG_FW_LOADER_USER_HELPER is not set
236CONFIG_CONNECTOR=m 274CONFIG_CONNECTOR=m
237CONFIG_BLK_DEV_LOOP=y 275CONFIG_BLK_DEV_LOOP=y
238CONFIG_BLK_DEV_CRYPTOLOOP=m 276CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -281,6 +319,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
281CONFIG_NET_TEAM_MODE_RANDOM=m 319CONFIG_NET_TEAM_MODE_RANDOM=m
282CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 320CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
283CONFIG_NET_TEAM_MODE_LOADBALANCE=m 321CONFIG_NET_TEAM_MODE_LOADBALANCE=m
322CONFIG_MACVLAN=m
323CONFIG_MACVTAP=m
324CONFIG_IPVLAN=m
284CONFIG_VXLAN=m 325CONFIG_VXLAN=m
285CONFIG_NETCONSOLE=m 326CONFIG_NETCONSOLE=m
286CONFIG_NETCONSOLE_DYNAMIC=y 327CONFIG_NETCONSOLE_DYNAMIC=y
@@ -291,6 +332,8 @@ CONFIG_VETH=m
291# CONFIG_NET_VENDOR_MARVELL is not set 332# CONFIG_NET_VENDOR_MARVELL is not set
292# CONFIG_NET_VENDOR_MICREL is not set 333# CONFIG_NET_VENDOR_MICREL is not set
293# CONFIG_NET_VENDOR_NATSEMI is not set 334# CONFIG_NET_VENDOR_NATSEMI is not set
335# CONFIG_NET_VENDOR_QUALCOMM is not set
336# CONFIG_NET_VENDOR_ROCKER is not set
294# CONFIG_NET_VENDOR_SAMSUNG is not set 337# CONFIG_NET_VENDOR_SAMSUNG is not set
295# CONFIG_NET_VENDOR_SEEQ is not set 338# CONFIG_NET_VENDOR_SEEQ is not set
296# CONFIG_NET_VENDOR_STMICRO is not set 339# CONFIG_NET_VENDOR_STMICRO is not set
@@ -332,6 +375,7 @@ CONFIG_HID=m
332CONFIG_HIDRAW=y 375CONFIG_HIDRAW=y
333CONFIG_UHID=m 376CONFIG_UHID=m
334# CONFIG_HID_GENERIC is not set 377# CONFIG_HID_GENERIC is not set
378# CONFIG_HID_PLANTRONICS is not set
335# CONFIG_USB_SUPPORT is not set 379# CONFIG_USB_SUPPORT is not set
336CONFIG_RTC_CLASS=y 380CONFIG_RTC_CLASS=y
337CONFIG_RTC_DRV_GENERIC=m 381CONFIG_RTC_DRV_GENERIC=m
@@ -350,6 +394,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
350CONFIG_AUTOFS4_FS=m 394CONFIG_AUTOFS4_FS=m
351CONFIG_FUSE_FS=m 395CONFIG_FUSE_FS=m
352CONFIG_CUSE=m 396CONFIG_CUSE=m
397CONFIG_OVERLAY_FS=m
353CONFIG_ISO9660_FS=y 398CONFIG_ISO9660_FS=y
354CONFIG_JOLIET=y 399CONFIG_JOLIET=y
355CONFIG_ZISOFS=y 400CONFIG_ZISOFS=y
@@ -365,6 +410,7 @@ CONFIG_HFS_FS=m
365CONFIG_HFSPLUS_FS=m 410CONFIG_HFSPLUS_FS=m
366CONFIG_CRAMFS=m 411CONFIG_CRAMFS=m
367CONFIG_SQUASHFS=m 412CONFIG_SQUASHFS=m
413CONFIG_SQUASHFS_LZ4=y
368CONFIG_SQUASHFS_LZO=y 414CONFIG_SQUASHFS_LZO=y
369CONFIG_MINIX_FS=m 415CONFIG_MINIX_FS=m
370CONFIG_OMFS_FS=m 416CONFIG_OMFS_FS=m
@@ -434,10 +480,18 @@ CONFIG_DLM=m
434CONFIG_MAGIC_SYSRQ=y 480CONFIG_MAGIC_SYSRQ=y
435CONFIG_ASYNC_RAID6_TEST=m 481CONFIG_ASYNC_RAID6_TEST=m
436CONFIG_TEST_STRING_HELPERS=m 482CONFIG_TEST_STRING_HELPERS=m
483CONFIG_TEST_KSTRTOX=m
484CONFIG_TEST_LKM=m
485CONFIG_TEST_USER_COPY=m
486CONFIG_TEST_BPF=m
487CONFIG_TEST_FIRMWARE=m
488CONFIG_TEST_UDELAY=m
489CONFIG_EARLY_PRINTK=y
437CONFIG_ENCRYPTED_KEYS=m 490CONFIG_ENCRYPTED_KEYS=m
438CONFIG_CRYPTO_MANAGER=y 491CONFIG_CRYPTO_MANAGER=y
439CONFIG_CRYPTO_USER=m 492CONFIG_CRYPTO_USER=m
440CONFIG_CRYPTO_CRYPTD=m 493CONFIG_CRYPTO_CRYPTD=m
494CONFIG_CRYPTO_MCRYPTD=m
441CONFIG_CRYPTO_TEST=m 495CONFIG_CRYPTO_TEST=m
442CONFIG_CRYPTO_CCM=m 496CONFIG_CRYPTO_CCM=m
443CONFIG_CRYPTO_GCM=m 497CONFIG_CRYPTO_GCM=m
@@ -472,13 +526,10 @@ CONFIG_CRYPTO_LZO=m
472CONFIG_CRYPTO_LZ4=m 526CONFIG_CRYPTO_LZ4=m
473CONFIG_CRYPTO_LZ4HC=m 527CONFIG_CRYPTO_LZ4HC=m
474# CONFIG_CRYPTO_ANSI_CPRNG is not set 528# CONFIG_CRYPTO_ANSI_CPRNG is not set
529CONFIG_CRYPTO_DRBG_MENU=m
530CONFIG_CRYPTO_DRBG_HASH=y
531CONFIG_CRYPTO_DRBG_CTR=y
475CONFIG_CRYPTO_USER_API_HASH=m 532CONFIG_CRYPTO_USER_API_HASH=m
476CONFIG_CRYPTO_USER_API_SKCIPHER=m 533CONFIG_CRYPTO_USER_API_SKCIPHER=m
477# CONFIG_CRYPTO_HW is not set 534# CONFIG_CRYPTO_HW is not set
478CONFIG_XZ_DEC_X86=y
479CONFIG_XZ_DEC_POWERPC=y
480CONFIG_XZ_DEC_IA64=y
481CONFIG_XZ_DEC_ARM=y
482CONFIG_XZ_DEC_ARMTHUMB=y
483CONFIG_XZ_DEC_SPARC=y
484CONFIG_XZ_DEC_TEST=m 535CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 391e185d73be..372593a3b398 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -31,8 +31,10 @@ CONFIG_M68030=y
31CONFIG_M68040=y 31CONFIG_M68040=y
32CONFIG_M68060=y 32CONFIG_M68060=y
33CONFIG_ATARI=y 33CONFIG_ATARI=y
34CONFIG_ATARI_ROM_ISA=y
34# CONFIG_COMPACTION is not set 35# CONFIG_COMPACTION is not set
35CONFIG_CLEANCACHE=y 36CONFIG_CLEANCACHE=y
37CONFIG_ZPOOL=m
36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
37CONFIG_BINFMT_AOUT=m 39CONFIG_BINFMT_AOUT=m
38CONFIG_BINFMT_MISC=m 40CONFIG_BINFMT_MISC=m
@@ -52,6 +54,8 @@ CONFIG_NET_IPIP=m
52CONFIG_NET_IPGRE_DEMUX=m 54CONFIG_NET_IPGRE_DEMUX=m
53CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
54CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m
55CONFIG_INET_AH=m 59CONFIG_INET_AH=m
56CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
57CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -93,6 +97,8 @@ CONFIG_NFT_HASH=m
93CONFIG_NFT_COUNTER=m 97CONFIG_NFT_COUNTER=m
94CONFIG_NFT_LOG=m 98CONFIG_NFT_LOG=m
95CONFIG_NFT_LIMIT=m 99CONFIG_NFT_LIMIT=m
100CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m
96CONFIG_NFT_NAT=m 102CONFIG_NFT_NAT=m
97CONFIG_NFT_QUEUE=m 103CONFIG_NFT_QUEUE=m
98CONFIG_NFT_REJECT=m 104CONFIG_NFT_REJECT=m
@@ -139,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
139CONFIG_NETFILTER_XT_MATCH_OSF=m 145CONFIG_NETFILTER_XT_MATCH_OSF=m
140CONFIG_NETFILTER_XT_MATCH_OWNER=m 146CONFIG_NETFILTER_XT_MATCH_OWNER=m
141CONFIG_NETFILTER_XT_MATCH_POLICY=m 147CONFIG_NETFILTER_XT_MATCH_POLICY=m
148CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
142CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 149CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
143CONFIG_NETFILTER_XT_MATCH_QUOTA=m 150CONFIG_NETFILTER_XT_MATCH_QUOTA=m
144CONFIG_NETFILTER_XT_MATCH_RATEEST=m 151CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -160,6 +167,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
160CONFIG_IP_SET_HASH_IPPORT=m 167CONFIG_IP_SET_HASH_IPPORT=m
161CONFIG_IP_SET_HASH_IPPORTIP=m 168CONFIG_IP_SET_HASH_IPPORTIP=m
162CONFIG_IP_SET_HASH_IPPORTNET=m 169CONFIG_IP_SET_HASH_IPPORTNET=m
170CONFIG_IP_SET_HASH_MAC=m
163CONFIG_IP_SET_HASH_NETPORTNET=m 171CONFIG_IP_SET_HASH_NETPORTNET=m
164CONFIG_IP_SET_HASH_NET=m 172CONFIG_IP_SET_HASH_NET=m
165CONFIG_IP_SET_HASH_NETNET=m 173CONFIG_IP_SET_HASH_NETNET=m
@@ -167,9 +175,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
167CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
168CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
169CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
170CONFIG_NFT_CHAIN_ROUTE_IPV4=m 179CONFIG_NFT_CHAIN_ROUTE_IPV4=m
171CONFIG_NFT_CHAIN_NAT_IPV4=m
172CONFIG_NF_TABLES_ARP=m 180CONFIG_NF_TABLES_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m
173CONFIG_IP_NF_IPTABLES=m 184CONFIG_IP_NF_IPTABLES=m
174CONFIG_IP_NF_MATCH_AH=m 185CONFIG_IP_NF_MATCH_AH=m
175CONFIG_IP_NF_MATCH_ECN=m 186CONFIG_IP_NF_MATCH_ECN=m
@@ -178,8 +189,7 @@ CONFIG_IP_NF_MATCH_TTL=m
178CONFIG_IP_NF_FILTER=m 189CONFIG_IP_NF_FILTER=m
179CONFIG_IP_NF_TARGET_REJECT=m 190CONFIG_IP_NF_TARGET_REJECT=m
180CONFIG_IP_NF_TARGET_SYNPROXY=m 191CONFIG_IP_NF_TARGET_SYNPROXY=m
181CONFIG_IP_NF_TARGET_ULOG=m 192CONFIG_IP_NF_NAT=m
182CONFIG_NF_NAT_IPV4=m
183CONFIG_IP_NF_TARGET_MASQUERADE=m 193CONFIG_IP_NF_TARGET_MASQUERADE=m
184CONFIG_IP_NF_TARGET_NETMAP=m 194CONFIG_IP_NF_TARGET_NETMAP=m
185CONFIG_IP_NF_TARGET_REDIRECT=m 195CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -194,6 +204,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
194CONFIG_NF_CONNTRACK_IPV6=m 204CONFIG_NF_CONNTRACK_IPV6=m
195CONFIG_NFT_CHAIN_ROUTE_IPV6=m 205CONFIG_NFT_CHAIN_ROUTE_IPV6=m
196CONFIG_NFT_CHAIN_NAT_IPV6=m 206CONFIG_NFT_CHAIN_NAT_IPV6=m
207CONFIG_NFT_MASQ_IPV6=m
208CONFIG_NFT_REDIR_IPV6=m
197CONFIG_IP6_NF_IPTABLES=m 209CONFIG_IP6_NF_IPTABLES=m
198CONFIG_IP6_NF_MATCH_AH=m 210CONFIG_IP6_NF_MATCH_AH=m
199CONFIG_IP6_NF_MATCH_EUI64=m 211CONFIG_IP6_NF_MATCH_EUI64=m
@@ -210,17 +222,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
210CONFIG_IP6_NF_TARGET_SYNPROXY=m 222CONFIG_IP6_NF_TARGET_SYNPROXY=m
211CONFIG_IP6_NF_MANGLE=m 223CONFIG_IP6_NF_MANGLE=m
212CONFIG_IP6_NF_RAW=m 224CONFIG_IP6_NF_RAW=m
213CONFIG_NF_NAT_IPV6=m 225CONFIG_IP6_NF_NAT=m
214CONFIG_IP6_NF_TARGET_MASQUERADE=m 226CONFIG_IP6_NF_TARGET_MASQUERADE=m
215CONFIG_IP6_NF_TARGET_NPT=m 227CONFIG_IP6_NF_TARGET_NPT=m
216CONFIG_NF_TABLES_BRIDGE=m 228CONFIG_NF_TABLES_BRIDGE=m
229CONFIG_NFT_BRIDGE_META=m
230CONFIG_NFT_BRIDGE_REJECT=m
231CONFIG_NF_LOG_BRIDGE=m
232CONFIG_BRIDGE_NF_EBTABLES=m
233CONFIG_BRIDGE_EBT_BROUTE=m
234CONFIG_BRIDGE_EBT_T_FILTER=m
235CONFIG_BRIDGE_EBT_T_NAT=m
236CONFIG_BRIDGE_EBT_802_3=m
237CONFIG_BRIDGE_EBT_AMONG=m
238CONFIG_BRIDGE_EBT_ARP=m
239CONFIG_BRIDGE_EBT_IP=m
240CONFIG_BRIDGE_EBT_IP6=m
241CONFIG_BRIDGE_EBT_LIMIT=m
242CONFIG_BRIDGE_EBT_MARK=m
243CONFIG_BRIDGE_EBT_PKTTYPE=m
244CONFIG_BRIDGE_EBT_STP=m
245CONFIG_BRIDGE_EBT_VLAN=m
246CONFIG_BRIDGE_EBT_ARPREPLY=m
247CONFIG_BRIDGE_EBT_DNAT=m
248CONFIG_BRIDGE_EBT_MARK_T=m
249CONFIG_BRIDGE_EBT_REDIRECT=m
250CONFIG_BRIDGE_EBT_SNAT=m
251CONFIG_BRIDGE_EBT_LOG=m
252CONFIG_BRIDGE_EBT_NFLOG=m
217CONFIG_IP_DCCP=m 253CONFIG_IP_DCCP=m
218# CONFIG_IP_DCCP_CCID3 is not set 254# CONFIG_IP_DCCP_CCID3 is not set
219CONFIG_SCTP_COOKIE_HMAC_SHA1=y 255CONFIG_SCTP_COOKIE_HMAC_SHA1=y
220CONFIG_RDS=m 256CONFIG_RDS=m
221CONFIG_RDS_TCP=m 257CONFIG_RDS_TCP=m
222CONFIG_L2TP=m 258CONFIG_L2TP=m
259CONFIG_BRIDGE=m
223CONFIG_ATALK=m 260CONFIG_ATALK=m
261CONFIG_6LOWPAN=m
224CONFIG_DNS_RESOLVER=y 262CONFIG_DNS_RESOLVER=y
225CONFIG_BATMAN_ADV=m 263CONFIG_BATMAN_ADV=m
226CONFIG_BATMAN_ADV_DAT=y 264CONFIG_BATMAN_ADV_DAT=y
@@ -229,9 +267,10 @@ CONFIG_BATMAN_ADV_MCAST=y
229CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
230CONFIG_NET_MPLS_GSO=m 268CONFIG_NET_MPLS_GSO=m
231# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set
232CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
272CONFIG_DEVTMPFS_MOUNT=y
233# CONFIG_FIRMWARE_IN_KERNEL is not set 273# CONFIG_FIRMWARE_IN_KERNEL is not set
234# CONFIG_FW_LOADER_USER_HELPER is not set
235CONFIG_CONNECTOR=m 274CONFIG_CONNECTOR=m
236CONFIG_PARPORT=m 275CONFIG_PARPORT=m
237CONFIG_PARPORT_ATARI=m 276CONFIG_PARPORT_ATARI=m
@@ -289,6 +328,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
289CONFIG_NET_TEAM_MODE_RANDOM=m 328CONFIG_NET_TEAM_MODE_RANDOM=m
290CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 329CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
291CONFIG_NET_TEAM_MODE_LOADBALANCE=m 330CONFIG_NET_TEAM_MODE_LOADBALANCE=m
331CONFIG_MACVLAN=m
332CONFIG_MACVTAP=m
333CONFIG_IPVLAN=m
292CONFIG_VXLAN=m 334CONFIG_VXLAN=m
293CONFIG_NETCONSOLE=m 335CONFIG_NETCONSOLE=m
294CONFIG_NETCONSOLE_DYNAMIC=y 336CONFIG_NETCONSOLE_DYNAMIC=y
@@ -299,8 +341,12 @@ CONFIG_ATARILANCE=y
299# CONFIG_NET_VENDOR_INTEL is not set 341# CONFIG_NET_VENDOR_INTEL is not set
300# CONFIG_NET_VENDOR_MARVELL is not set 342# CONFIG_NET_VENDOR_MARVELL is not set
301# CONFIG_NET_VENDOR_MICREL is not set 343# CONFIG_NET_VENDOR_MICREL is not set
344CONFIG_NE2000=y
345# CONFIG_NET_VENDOR_QUALCOMM is not set
346# CONFIG_NET_VENDOR_ROCKER is not set
302# CONFIG_NET_VENDOR_SAMSUNG is not set 347# CONFIG_NET_VENDOR_SAMSUNG is not set
303# CONFIG_NET_VENDOR_SEEQ is not set 348# CONFIG_NET_VENDOR_SEEQ is not set
349CONFIG_SMC91X=y
304# CONFIG_NET_VENDOR_STMICRO is not set 350# CONFIG_NET_VENDOR_STMICRO is not set
305# CONFIG_NET_VENDOR_VIA is not set 351# CONFIG_NET_VENDOR_VIA is not set
306# CONFIG_NET_VENDOR_WIZNET is not set 352# CONFIG_NET_VENDOR_WIZNET is not set
@@ -345,6 +391,7 @@ CONFIG_DMASOUND_ATARI=m
345CONFIG_HID=m 391CONFIG_HID=m
346CONFIG_HIDRAW=y 392CONFIG_HIDRAW=y
347CONFIG_UHID=m 393CONFIG_UHID=m
394# CONFIG_HID_PLANTRONICS is not set
348CONFIG_RTC_CLASS=y 395CONFIG_RTC_CLASS=y
349CONFIG_RTC_DRV_GENERIC=m 396CONFIG_RTC_DRV_GENERIC=m
350# CONFIG_IOMMU_SUPPORT is not set 397# CONFIG_IOMMU_SUPPORT is not set
@@ -354,6 +401,8 @@ CONFIG_NATFEAT=y
354CONFIG_NFBLOCK=y 401CONFIG_NFBLOCK=y
355CONFIG_NFCON=y 402CONFIG_NFCON=y
356CONFIG_NFETH=y 403CONFIG_NFETH=y
404CONFIG_ATARI_ETHERNAT=y
405CONFIG_ATARI_ETHERNEC=y
357CONFIG_ATARI_DSP56K=m 406CONFIG_ATARI_DSP56K=m
358CONFIG_EXT4_FS=y 407CONFIG_EXT4_FS=y
359CONFIG_REISERFS_FS=m 408CONFIG_REISERFS_FS=m
@@ -367,6 +416,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
367CONFIG_AUTOFS4_FS=m 416CONFIG_AUTOFS4_FS=m
368CONFIG_FUSE_FS=m 417CONFIG_FUSE_FS=m
369CONFIG_CUSE=m 418CONFIG_CUSE=m
419CONFIG_OVERLAY_FS=m
370CONFIG_ISO9660_FS=y 420CONFIG_ISO9660_FS=y
371CONFIG_JOLIET=y 421CONFIG_JOLIET=y
372CONFIG_ZISOFS=y 422CONFIG_ZISOFS=y
@@ -382,6 +432,7 @@ CONFIG_HFS_FS=m
382CONFIG_HFSPLUS_FS=m 432CONFIG_HFSPLUS_FS=m
383CONFIG_CRAMFS=m 433CONFIG_CRAMFS=m
384CONFIG_SQUASHFS=m 434CONFIG_SQUASHFS=m
435CONFIG_SQUASHFS_LZ4=y
385CONFIG_SQUASHFS_LZO=y 436CONFIG_SQUASHFS_LZO=y
386CONFIG_MINIX_FS=m 437CONFIG_MINIX_FS=m
387CONFIG_OMFS_FS=m 438CONFIG_OMFS_FS=m
@@ -451,10 +502,18 @@ CONFIG_DLM=m
451CONFIG_MAGIC_SYSRQ=y 502CONFIG_MAGIC_SYSRQ=y
452CONFIG_ASYNC_RAID6_TEST=m 503CONFIG_ASYNC_RAID6_TEST=m
453CONFIG_TEST_STRING_HELPERS=m 504CONFIG_TEST_STRING_HELPERS=m
505CONFIG_TEST_KSTRTOX=m
506CONFIG_TEST_LKM=m
507CONFIG_TEST_USER_COPY=m
508CONFIG_TEST_BPF=m
509CONFIG_TEST_FIRMWARE=m
510CONFIG_TEST_UDELAY=m
511CONFIG_EARLY_PRINTK=y
454CONFIG_ENCRYPTED_KEYS=m 512CONFIG_ENCRYPTED_KEYS=m
455CONFIG_CRYPTO_MANAGER=y 513CONFIG_CRYPTO_MANAGER=y
456CONFIG_CRYPTO_USER=m 514CONFIG_CRYPTO_USER=m
457CONFIG_CRYPTO_CRYPTD=m 515CONFIG_CRYPTO_CRYPTD=m
516CONFIG_CRYPTO_MCRYPTD=m
458CONFIG_CRYPTO_TEST=m 517CONFIG_CRYPTO_TEST=m
459CONFIG_CRYPTO_CCM=m 518CONFIG_CRYPTO_CCM=m
460CONFIG_CRYPTO_GCM=m 519CONFIG_CRYPTO_GCM=m
@@ -489,13 +548,10 @@ CONFIG_CRYPTO_LZO=m
489CONFIG_CRYPTO_LZ4=m 548CONFIG_CRYPTO_LZ4=m
490CONFIG_CRYPTO_LZ4HC=m 549CONFIG_CRYPTO_LZ4HC=m
491# CONFIG_CRYPTO_ANSI_CPRNG is not set 550# CONFIG_CRYPTO_ANSI_CPRNG is not set
551CONFIG_CRYPTO_DRBG_MENU=m
552CONFIG_CRYPTO_DRBG_HASH=y
553CONFIG_CRYPTO_DRBG_CTR=y
492CONFIG_CRYPTO_USER_API_HASH=m 554CONFIG_CRYPTO_USER_API_HASH=m
493CONFIG_CRYPTO_USER_API_SKCIPHER=m 555CONFIG_CRYPTO_USER_API_SKCIPHER=m
494# CONFIG_CRYPTO_HW is not set 556# CONFIG_CRYPTO_HW is not set
495CONFIG_XZ_DEC_X86=y
496CONFIG_XZ_DEC_POWERPC=y
497CONFIG_XZ_DEC_IA64=y
498CONFIG_XZ_DEC_ARM=y
499CONFIG_XZ_DEC_ARMTHUMB=y
500CONFIG_XZ_DEC_SPARC=y
501CONFIG_XZ_DEC_TEST=m 557CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index d0e705d1a063..f3bd35e76ea4 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -32,6 +32,7 @@ CONFIG_VME=y
32CONFIG_BVME6000=y 32CONFIG_BVME6000=y
33# CONFIG_COMPACTION is not set 33# CONFIG_COMPACTION is not set
34CONFIG_CLEANCACHE=y 34CONFIG_CLEANCACHE=y
35CONFIG_ZPOOL=m
35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36CONFIG_BINFMT_AOUT=m 37CONFIG_BINFMT_AOUT=m
37CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
@@ -51,6 +52,8 @@ CONFIG_NET_IPIP=m
51CONFIG_NET_IPGRE_DEMUX=m 52CONFIG_NET_IPGRE_DEMUX=m
52CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
53CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m
54CONFIG_INET_AH=m 57CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -92,6 +95,8 @@ CONFIG_NFT_HASH=m
92CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
93CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
94CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
98CONFIG_NFT_MASQ=m
99CONFIG_NFT_REDIR=m
95CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
96CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
97CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
@@ -138,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
138CONFIG_NETFILTER_XT_MATCH_OSF=m 143CONFIG_NETFILTER_XT_MATCH_OSF=m
139CONFIG_NETFILTER_XT_MATCH_OWNER=m 144CONFIG_NETFILTER_XT_MATCH_OWNER=m
140CONFIG_NETFILTER_XT_MATCH_POLICY=m 145CONFIG_NETFILTER_XT_MATCH_POLICY=m
146CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
141CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 147CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
142CONFIG_NETFILTER_XT_MATCH_QUOTA=m 148CONFIG_NETFILTER_XT_MATCH_QUOTA=m
143CONFIG_NETFILTER_XT_MATCH_RATEEST=m 149CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -159,6 +165,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
159CONFIG_IP_SET_HASH_IPPORT=m 165CONFIG_IP_SET_HASH_IPPORT=m
160CONFIG_IP_SET_HASH_IPPORTIP=m 166CONFIG_IP_SET_HASH_IPPORTIP=m
161CONFIG_IP_SET_HASH_IPPORTNET=m 167CONFIG_IP_SET_HASH_IPPORTNET=m
168CONFIG_IP_SET_HASH_MAC=m
162CONFIG_IP_SET_HASH_NETPORTNET=m 169CONFIG_IP_SET_HASH_NETPORTNET=m
163CONFIG_IP_SET_HASH_NET=m 170CONFIG_IP_SET_HASH_NET=m
164CONFIG_IP_SET_HASH_NETNET=m 171CONFIG_IP_SET_HASH_NETNET=m
@@ -166,9 +173,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
166CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
167CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
168CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
169CONFIG_NFT_CHAIN_ROUTE_IPV4=m 177CONFIG_NFT_CHAIN_ROUTE_IPV4=m
170CONFIG_NFT_CHAIN_NAT_IPV4=m
171CONFIG_NF_TABLES_ARP=m 178CONFIG_NF_TABLES_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m
172CONFIG_IP_NF_IPTABLES=m 182CONFIG_IP_NF_IPTABLES=m
173CONFIG_IP_NF_MATCH_AH=m 183CONFIG_IP_NF_MATCH_AH=m
174CONFIG_IP_NF_MATCH_ECN=m 184CONFIG_IP_NF_MATCH_ECN=m
@@ -177,8 +187,7 @@ CONFIG_IP_NF_MATCH_TTL=m
177CONFIG_IP_NF_FILTER=m 187CONFIG_IP_NF_FILTER=m
178CONFIG_IP_NF_TARGET_REJECT=m 188CONFIG_IP_NF_TARGET_REJECT=m
179CONFIG_IP_NF_TARGET_SYNPROXY=m 189CONFIG_IP_NF_TARGET_SYNPROXY=m
180CONFIG_IP_NF_TARGET_ULOG=m 190CONFIG_IP_NF_NAT=m
181CONFIG_NF_NAT_IPV4=m
182CONFIG_IP_NF_TARGET_MASQUERADE=m 191CONFIG_IP_NF_TARGET_MASQUERADE=m
183CONFIG_IP_NF_TARGET_NETMAP=m 192CONFIG_IP_NF_TARGET_NETMAP=m
184CONFIG_IP_NF_TARGET_REDIRECT=m 193CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -193,6 +202,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
193CONFIG_NF_CONNTRACK_IPV6=m 202CONFIG_NF_CONNTRACK_IPV6=m
194CONFIG_NFT_CHAIN_ROUTE_IPV6=m 203CONFIG_NFT_CHAIN_ROUTE_IPV6=m
195CONFIG_NFT_CHAIN_NAT_IPV6=m 204CONFIG_NFT_CHAIN_NAT_IPV6=m
205CONFIG_NFT_MASQ_IPV6=m
206CONFIG_NFT_REDIR_IPV6=m
196CONFIG_IP6_NF_IPTABLES=m 207CONFIG_IP6_NF_IPTABLES=m
197CONFIG_IP6_NF_MATCH_AH=m 208CONFIG_IP6_NF_MATCH_AH=m
198CONFIG_IP6_NF_MATCH_EUI64=m 209CONFIG_IP6_NF_MATCH_EUI64=m
@@ -209,17 +220,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
209CONFIG_IP6_NF_TARGET_SYNPROXY=m 220CONFIG_IP6_NF_TARGET_SYNPROXY=m
210CONFIG_IP6_NF_MANGLE=m 221CONFIG_IP6_NF_MANGLE=m
211CONFIG_IP6_NF_RAW=m 222CONFIG_IP6_NF_RAW=m
212CONFIG_NF_NAT_IPV6=m 223CONFIG_IP6_NF_NAT=m
213CONFIG_IP6_NF_TARGET_MASQUERADE=m 224CONFIG_IP6_NF_TARGET_MASQUERADE=m
214CONFIG_IP6_NF_TARGET_NPT=m 225CONFIG_IP6_NF_TARGET_NPT=m
215CONFIG_NF_TABLES_BRIDGE=m 226CONFIG_NF_TABLES_BRIDGE=m
227CONFIG_NFT_BRIDGE_META=m
228CONFIG_NFT_BRIDGE_REJECT=m
229CONFIG_NF_LOG_BRIDGE=m
230CONFIG_BRIDGE_NF_EBTABLES=m
231CONFIG_BRIDGE_EBT_BROUTE=m
232CONFIG_BRIDGE_EBT_T_FILTER=m
233CONFIG_BRIDGE_EBT_T_NAT=m
234CONFIG_BRIDGE_EBT_802_3=m
235CONFIG_BRIDGE_EBT_AMONG=m
236CONFIG_BRIDGE_EBT_ARP=m
237CONFIG_BRIDGE_EBT_IP=m
238CONFIG_BRIDGE_EBT_IP6=m
239CONFIG_BRIDGE_EBT_LIMIT=m
240CONFIG_BRIDGE_EBT_MARK=m
241CONFIG_BRIDGE_EBT_PKTTYPE=m
242CONFIG_BRIDGE_EBT_STP=m
243CONFIG_BRIDGE_EBT_VLAN=m
244CONFIG_BRIDGE_EBT_ARPREPLY=m
245CONFIG_BRIDGE_EBT_DNAT=m
246CONFIG_BRIDGE_EBT_MARK_T=m
247CONFIG_BRIDGE_EBT_REDIRECT=m
248CONFIG_BRIDGE_EBT_SNAT=m
249CONFIG_BRIDGE_EBT_LOG=m
250CONFIG_BRIDGE_EBT_NFLOG=m
216CONFIG_IP_DCCP=m 251CONFIG_IP_DCCP=m
217# CONFIG_IP_DCCP_CCID3 is not set 252# CONFIG_IP_DCCP_CCID3 is not set
218CONFIG_SCTP_COOKIE_HMAC_SHA1=y 253CONFIG_SCTP_COOKIE_HMAC_SHA1=y
219CONFIG_RDS=m 254CONFIG_RDS=m
220CONFIG_RDS_TCP=m 255CONFIG_RDS_TCP=m
221CONFIG_L2TP=m 256CONFIG_L2TP=m
257CONFIG_BRIDGE=m
222CONFIG_ATALK=m 258CONFIG_ATALK=m
259CONFIG_6LOWPAN=m
223CONFIG_DNS_RESOLVER=y 260CONFIG_DNS_RESOLVER=y
224CONFIG_BATMAN_ADV=m 261CONFIG_BATMAN_ADV=m
225CONFIG_BATMAN_ADV_DAT=y 262CONFIG_BATMAN_ADV_DAT=y
@@ -228,9 +265,10 @@ CONFIG_BATMAN_ADV_MCAST=y
228CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
229CONFIG_NET_MPLS_GSO=m 266CONFIG_NET_MPLS_GSO=m
230# CONFIG_WIRELESS is not set 267# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set
231CONFIG_DEVTMPFS=y 269CONFIG_DEVTMPFS=y
270CONFIG_DEVTMPFS_MOUNT=y
232# CONFIG_FIRMWARE_IN_KERNEL is not set 271# CONFIG_FIRMWARE_IN_KERNEL is not set
233# CONFIG_FW_LOADER_USER_HELPER is not set
234CONFIG_CONNECTOR=m 272CONFIG_CONNECTOR=m
235CONFIG_BLK_DEV_LOOP=y 273CONFIG_BLK_DEV_LOOP=y
236CONFIG_BLK_DEV_CRYPTOLOOP=m 274CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -280,6 +318,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
280CONFIG_NET_TEAM_MODE_RANDOM=m 318CONFIG_NET_TEAM_MODE_RANDOM=m
281CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 319CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
282CONFIG_NET_TEAM_MODE_LOADBALANCE=m 320CONFIG_NET_TEAM_MODE_LOADBALANCE=m
321CONFIG_MACVLAN=m
322CONFIG_MACVTAP=m
323CONFIG_IPVLAN=m
283CONFIG_VXLAN=m 324CONFIG_VXLAN=m
284CONFIG_NETCONSOLE=m 325CONFIG_NETCONSOLE=m
285CONFIG_NETCONSOLE_DYNAMIC=y 326CONFIG_NETCONSOLE_DYNAMIC=y
@@ -290,6 +331,8 @@ CONFIG_BVME6000_NET=y
290# CONFIG_NET_VENDOR_MARVELL is not set 331# CONFIG_NET_VENDOR_MARVELL is not set
291# CONFIG_NET_VENDOR_MICREL is not set 332# CONFIG_NET_VENDOR_MICREL is not set
292# CONFIG_NET_VENDOR_NATSEMI is not set 333# CONFIG_NET_VENDOR_NATSEMI is not set
334# CONFIG_NET_VENDOR_QUALCOMM is not set
335# CONFIG_NET_VENDOR_ROCKER is not set
293# CONFIG_NET_VENDOR_SAMSUNG is not set 336# CONFIG_NET_VENDOR_SAMSUNG is not set
294# CONFIG_NET_VENDOR_SEEQ is not set 337# CONFIG_NET_VENDOR_SEEQ is not set
295# CONFIG_NET_VENDOR_STMICRO is not set 338# CONFIG_NET_VENDOR_STMICRO is not set
@@ -326,6 +369,7 @@ CONFIG_HID=m
326CONFIG_HIDRAW=y 369CONFIG_HIDRAW=y
327CONFIG_UHID=m 370CONFIG_UHID=m
328# CONFIG_HID_GENERIC is not set 371# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
329# CONFIG_USB_SUPPORT is not set 373# CONFIG_USB_SUPPORT is not set
330CONFIG_RTC_CLASS=y 374CONFIG_RTC_CLASS=y
331CONFIG_RTC_DRV_GENERIC=m 375CONFIG_RTC_DRV_GENERIC=m
@@ -343,6 +387,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
343CONFIG_AUTOFS4_FS=m 387CONFIG_AUTOFS4_FS=m
344CONFIG_FUSE_FS=m 388CONFIG_FUSE_FS=m
345CONFIG_CUSE=m 389CONFIG_CUSE=m
390CONFIG_OVERLAY_FS=m
346CONFIG_ISO9660_FS=y 391CONFIG_ISO9660_FS=y
347CONFIG_JOLIET=y 392CONFIG_JOLIET=y
348CONFIG_ZISOFS=y 393CONFIG_ZISOFS=y
@@ -358,6 +403,7 @@ CONFIG_HFS_FS=m
358CONFIG_HFSPLUS_FS=m 403CONFIG_HFSPLUS_FS=m
359CONFIG_CRAMFS=m 404CONFIG_CRAMFS=m
360CONFIG_SQUASHFS=m 405CONFIG_SQUASHFS=m
406CONFIG_SQUASHFS_LZ4=y
361CONFIG_SQUASHFS_LZO=y 407CONFIG_SQUASHFS_LZO=y
362CONFIG_MINIX_FS=m 408CONFIG_MINIX_FS=m
363CONFIG_OMFS_FS=m 409CONFIG_OMFS_FS=m
@@ -427,10 +473,18 @@ CONFIG_DLM=m
427CONFIG_MAGIC_SYSRQ=y 473CONFIG_MAGIC_SYSRQ=y
428CONFIG_ASYNC_RAID6_TEST=m 474CONFIG_ASYNC_RAID6_TEST=m
429CONFIG_TEST_STRING_HELPERS=m 475CONFIG_TEST_STRING_HELPERS=m
476CONFIG_TEST_KSTRTOX=m
477CONFIG_TEST_LKM=m
478CONFIG_TEST_USER_COPY=m
479CONFIG_TEST_BPF=m
480CONFIG_TEST_FIRMWARE=m
481CONFIG_TEST_UDELAY=m
482CONFIG_EARLY_PRINTK=y
430CONFIG_ENCRYPTED_KEYS=m 483CONFIG_ENCRYPTED_KEYS=m
431CONFIG_CRYPTO_MANAGER=y 484CONFIG_CRYPTO_MANAGER=y
432CONFIG_CRYPTO_USER=m 485CONFIG_CRYPTO_USER=m
433CONFIG_CRYPTO_CRYPTD=m 486CONFIG_CRYPTO_CRYPTD=m
487CONFIG_CRYPTO_MCRYPTD=m
434CONFIG_CRYPTO_TEST=m 488CONFIG_CRYPTO_TEST=m
435CONFIG_CRYPTO_CCM=m 489CONFIG_CRYPTO_CCM=m
436CONFIG_CRYPTO_GCM=m 490CONFIG_CRYPTO_GCM=m
@@ -465,13 +519,10 @@ CONFIG_CRYPTO_LZO=m
465CONFIG_CRYPTO_LZ4=m 519CONFIG_CRYPTO_LZ4=m
466CONFIG_CRYPTO_LZ4HC=m 520CONFIG_CRYPTO_LZ4HC=m
467# CONFIG_CRYPTO_ANSI_CPRNG is not set 521# CONFIG_CRYPTO_ANSI_CPRNG is not set
522CONFIG_CRYPTO_DRBG_MENU=m
523CONFIG_CRYPTO_DRBG_HASH=y
524CONFIG_CRYPTO_DRBG_CTR=y
468CONFIG_CRYPTO_USER_API_HASH=m 525CONFIG_CRYPTO_USER_API_HASH=m
469CONFIG_CRYPTO_USER_API_SKCIPHER=m 526CONFIG_CRYPTO_USER_API_SKCIPHER=m
470# CONFIG_CRYPTO_HW is not set 527# CONFIG_CRYPTO_HW is not set
471CONFIG_XZ_DEC_X86=y
472CONFIG_XZ_DEC_POWERPC=y
473CONFIG_XZ_DEC_IA64=y
474CONFIG_XZ_DEC_ARM=y
475CONFIG_XZ_DEC_ARMTHUMB=y
476CONFIG_XZ_DEC_SPARC=y
477CONFIG_XZ_DEC_TEST=m 528CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index fdc7e9672249..9f9793fb2b73 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -34,6 +34,7 @@ CONFIG_M68060=y
34CONFIG_HP300=y 34CONFIG_HP300=y
35# CONFIG_COMPACTION is not set 35# CONFIG_COMPACTION is not set
36CONFIG_CLEANCACHE=y 36CONFIG_CLEANCACHE=y
37CONFIG_ZPOOL=m
37# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
38CONFIG_BINFMT_AOUT=m 39CONFIG_BINFMT_AOUT=m
39CONFIG_BINFMT_MISC=m 40CONFIG_BINFMT_MISC=m
@@ -53,6 +54,8 @@ CONFIG_NET_IPIP=m
53CONFIG_NET_IPGRE_DEMUX=m 54CONFIG_NET_IPGRE_DEMUX=m
54CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
55CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m
56CONFIG_INET_AH=m 59CONFIG_INET_AH=m
57CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
58CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -94,6 +97,8 @@ CONFIG_NFT_HASH=m
94CONFIG_NFT_COUNTER=m 97CONFIG_NFT_COUNTER=m
95CONFIG_NFT_LOG=m 98CONFIG_NFT_LOG=m
96CONFIG_NFT_LIMIT=m 99CONFIG_NFT_LIMIT=m
100CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m
97CONFIG_NFT_NAT=m 102CONFIG_NFT_NAT=m
98CONFIG_NFT_QUEUE=m 103CONFIG_NFT_QUEUE=m
99CONFIG_NFT_REJECT=m 104CONFIG_NFT_REJECT=m
@@ -140,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
140CONFIG_NETFILTER_XT_MATCH_OSF=m 145CONFIG_NETFILTER_XT_MATCH_OSF=m
141CONFIG_NETFILTER_XT_MATCH_OWNER=m 146CONFIG_NETFILTER_XT_MATCH_OWNER=m
142CONFIG_NETFILTER_XT_MATCH_POLICY=m 147CONFIG_NETFILTER_XT_MATCH_POLICY=m
148CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
143CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 149CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
144CONFIG_NETFILTER_XT_MATCH_QUOTA=m 150CONFIG_NETFILTER_XT_MATCH_QUOTA=m
145CONFIG_NETFILTER_XT_MATCH_RATEEST=m 151CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -161,6 +167,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
161CONFIG_IP_SET_HASH_IPPORT=m 167CONFIG_IP_SET_HASH_IPPORT=m
162CONFIG_IP_SET_HASH_IPPORTIP=m 168CONFIG_IP_SET_HASH_IPPORTIP=m
163CONFIG_IP_SET_HASH_IPPORTNET=m 169CONFIG_IP_SET_HASH_IPPORTNET=m
170CONFIG_IP_SET_HASH_MAC=m
164CONFIG_IP_SET_HASH_NETPORTNET=m 171CONFIG_IP_SET_HASH_NETPORTNET=m
165CONFIG_IP_SET_HASH_NET=m 172CONFIG_IP_SET_HASH_NET=m
166CONFIG_IP_SET_HASH_NETNET=m 173CONFIG_IP_SET_HASH_NETNET=m
@@ -168,9 +175,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
168CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
169CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
170CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
171CONFIG_NFT_CHAIN_ROUTE_IPV4=m 179CONFIG_NFT_CHAIN_ROUTE_IPV4=m
172CONFIG_NFT_CHAIN_NAT_IPV4=m
173CONFIG_NF_TABLES_ARP=m 180CONFIG_NF_TABLES_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m
174CONFIG_IP_NF_IPTABLES=m 184CONFIG_IP_NF_IPTABLES=m
175CONFIG_IP_NF_MATCH_AH=m 185CONFIG_IP_NF_MATCH_AH=m
176CONFIG_IP_NF_MATCH_ECN=m 186CONFIG_IP_NF_MATCH_ECN=m
@@ -179,8 +189,7 @@ CONFIG_IP_NF_MATCH_TTL=m
179CONFIG_IP_NF_FILTER=m 189CONFIG_IP_NF_FILTER=m
180CONFIG_IP_NF_TARGET_REJECT=m 190CONFIG_IP_NF_TARGET_REJECT=m
181CONFIG_IP_NF_TARGET_SYNPROXY=m 191CONFIG_IP_NF_TARGET_SYNPROXY=m
182CONFIG_IP_NF_TARGET_ULOG=m 192CONFIG_IP_NF_NAT=m
183CONFIG_NF_NAT_IPV4=m
184CONFIG_IP_NF_TARGET_MASQUERADE=m 193CONFIG_IP_NF_TARGET_MASQUERADE=m
185CONFIG_IP_NF_TARGET_NETMAP=m 194CONFIG_IP_NF_TARGET_NETMAP=m
186CONFIG_IP_NF_TARGET_REDIRECT=m 195CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -195,6 +204,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
195CONFIG_NF_CONNTRACK_IPV6=m 204CONFIG_NF_CONNTRACK_IPV6=m
196CONFIG_NFT_CHAIN_ROUTE_IPV6=m 205CONFIG_NFT_CHAIN_ROUTE_IPV6=m
197CONFIG_NFT_CHAIN_NAT_IPV6=m 206CONFIG_NFT_CHAIN_NAT_IPV6=m
207CONFIG_NFT_MASQ_IPV6=m
208CONFIG_NFT_REDIR_IPV6=m
198CONFIG_IP6_NF_IPTABLES=m 209CONFIG_IP6_NF_IPTABLES=m
199CONFIG_IP6_NF_MATCH_AH=m 210CONFIG_IP6_NF_MATCH_AH=m
200CONFIG_IP6_NF_MATCH_EUI64=m 211CONFIG_IP6_NF_MATCH_EUI64=m
@@ -211,17 +222,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
211CONFIG_IP6_NF_TARGET_SYNPROXY=m 222CONFIG_IP6_NF_TARGET_SYNPROXY=m
212CONFIG_IP6_NF_MANGLE=m 223CONFIG_IP6_NF_MANGLE=m
213CONFIG_IP6_NF_RAW=m 224CONFIG_IP6_NF_RAW=m
214CONFIG_NF_NAT_IPV6=m 225CONFIG_IP6_NF_NAT=m
215CONFIG_IP6_NF_TARGET_MASQUERADE=m 226CONFIG_IP6_NF_TARGET_MASQUERADE=m
216CONFIG_IP6_NF_TARGET_NPT=m 227CONFIG_IP6_NF_TARGET_NPT=m
217CONFIG_NF_TABLES_BRIDGE=m 228CONFIG_NF_TABLES_BRIDGE=m
229CONFIG_NFT_BRIDGE_META=m
230CONFIG_NFT_BRIDGE_REJECT=m
231CONFIG_NF_LOG_BRIDGE=m
232CONFIG_BRIDGE_NF_EBTABLES=m
233CONFIG_BRIDGE_EBT_BROUTE=m
234CONFIG_BRIDGE_EBT_T_FILTER=m
235CONFIG_BRIDGE_EBT_T_NAT=m
236CONFIG_BRIDGE_EBT_802_3=m
237CONFIG_BRIDGE_EBT_AMONG=m
238CONFIG_BRIDGE_EBT_ARP=m
239CONFIG_BRIDGE_EBT_IP=m
240CONFIG_BRIDGE_EBT_IP6=m
241CONFIG_BRIDGE_EBT_LIMIT=m
242CONFIG_BRIDGE_EBT_MARK=m
243CONFIG_BRIDGE_EBT_PKTTYPE=m
244CONFIG_BRIDGE_EBT_STP=m
245CONFIG_BRIDGE_EBT_VLAN=m
246CONFIG_BRIDGE_EBT_ARPREPLY=m
247CONFIG_BRIDGE_EBT_DNAT=m
248CONFIG_BRIDGE_EBT_MARK_T=m
249CONFIG_BRIDGE_EBT_REDIRECT=m
250CONFIG_BRIDGE_EBT_SNAT=m
251CONFIG_BRIDGE_EBT_LOG=m
252CONFIG_BRIDGE_EBT_NFLOG=m
218CONFIG_IP_DCCP=m 253CONFIG_IP_DCCP=m
219# CONFIG_IP_DCCP_CCID3 is not set 254# CONFIG_IP_DCCP_CCID3 is not set
220CONFIG_SCTP_COOKIE_HMAC_SHA1=y 255CONFIG_SCTP_COOKIE_HMAC_SHA1=y
221CONFIG_RDS=m 256CONFIG_RDS=m
222CONFIG_RDS_TCP=m 257CONFIG_RDS_TCP=m
223CONFIG_L2TP=m 258CONFIG_L2TP=m
259CONFIG_BRIDGE=m
224CONFIG_ATALK=m 260CONFIG_ATALK=m
261CONFIG_6LOWPAN=m
225CONFIG_DNS_RESOLVER=y 262CONFIG_DNS_RESOLVER=y
226CONFIG_BATMAN_ADV=m 263CONFIG_BATMAN_ADV=m
227CONFIG_BATMAN_ADV_DAT=y 264CONFIG_BATMAN_ADV_DAT=y
@@ -230,9 +267,10 @@ CONFIG_BATMAN_ADV_MCAST=y
230CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
231CONFIG_NET_MPLS_GSO=m 268CONFIG_NET_MPLS_GSO=m
232# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set
233CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
272CONFIG_DEVTMPFS_MOUNT=y
234# CONFIG_FIRMWARE_IN_KERNEL is not set 273# CONFIG_FIRMWARE_IN_KERNEL is not set
235# CONFIG_FW_LOADER_USER_HELPER is not set
236CONFIG_CONNECTOR=m 274CONFIG_CONNECTOR=m
237CONFIG_BLK_DEV_LOOP=y 275CONFIG_BLK_DEV_LOOP=y
238CONFIG_BLK_DEV_CRYPTOLOOP=m 276CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -281,6 +319,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
281CONFIG_NET_TEAM_MODE_RANDOM=m 319CONFIG_NET_TEAM_MODE_RANDOM=m
282CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 320CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
283CONFIG_NET_TEAM_MODE_LOADBALANCE=m 321CONFIG_NET_TEAM_MODE_LOADBALANCE=m
322CONFIG_MACVLAN=m
323CONFIG_MACVTAP=m
324CONFIG_IPVLAN=m
284CONFIG_VXLAN=m 325CONFIG_VXLAN=m
285CONFIG_NETCONSOLE=m 326CONFIG_NETCONSOLE=m
286CONFIG_NETCONSOLE_DYNAMIC=y 327CONFIG_NETCONSOLE_DYNAMIC=y
@@ -292,6 +333,8 @@ CONFIG_HPLANCE=y
292# CONFIG_NET_VENDOR_MARVELL is not set 333# CONFIG_NET_VENDOR_MARVELL is not set
293# CONFIG_NET_VENDOR_MICREL is not set 334# CONFIG_NET_VENDOR_MICREL is not set
294# CONFIG_NET_VENDOR_NATSEMI is not set 335# CONFIG_NET_VENDOR_NATSEMI is not set
336# CONFIG_NET_VENDOR_QUALCOMM is not set
337# CONFIG_NET_VENDOR_ROCKER is not set
295# CONFIG_NET_VENDOR_SAMSUNG is not set 338# CONFIG_NET_VENDOR_SAMSUNG is not set
296# CONFIG_NET_VENDOR_SEEQ is not set 339# CONFIG_NET_VENDOR_SEEQ is not set
297# CONFIG_NET_VENDOR_STMICRO is not set 340# CONFIG_NET_VENDOR_STMICRO is not set
@@ -335,6 +378,7 @@ CONFIG_HID=m
335CONFIG_HIDRAW=y 378CONFIG_HIDRAW=y
336CONFIG_UHID=m 379CONFIG_UHID=m
337# CONFIG_HID_GENERIC is not set 380# CONFIG_HID_GENERIC is not set
381# CONFIG_HID_PLANTRONICS is not set
338# CONFIG_USB_SUPPORT is not set 382# CONFIG_USB_SUPPORT is not set
339CONFIG_RTC_CLASS=y 383CONFIG_RTC_CLASS=y
340CONFIG_RTC_DRV_GENERIC=m 384CONFIG_RTC_DRV_GENERIC=m
@@ -352,6 +396,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
352CONFIG_AUTOFS4_FS=m 396CONFIG_AUTOFS4_FS=m
353CONFIG_FUSE_FS=m 397CONFIG_FUSE_FS=m
354CONFIG_CUSE=m 398CONFIG_CUSE=m
399CONFIG_OVERLAY_FS=m
355CONFIG_ISO9660_FS=y 400CONFIG_ISO9660_FS=y
356CONFIG_JOLIET=y 401CONFIG_JOLIET=y
357CONFIG_ZISOFS=y 402CONFIG_ZISOFS=y
@@ -367,6 +412,7 @@ CONFIG_HFS_FS=m
367CONFIG_HFSPLUS_FS=m 412CONFIG_HFSPLUS_FS=m
368CONFIG_CRAMFS=m 413CONFIG_CRAMFS=m
369CONFIG_SQUASHFS=m 414CONFIG_SQUASHFS=m
415CONFIG_SQUASHFS_LZ4=y
370CONFIG_SQUASHFS_LZO=y 416CONFIG_SQUASHFS_LZO=y
371CONFIG_MINIX_FS=m 417CONFIG_MINIX_FS=m
372CONFIG_OMFS_FS=m 418CONFIG_OMFS_FS=m
@@ -436,10 +482,18 @@ CONFIG_DLM=m
436CONFIG_MAGIC_SYSRQ=y 482CONFIG_MAGIC_SYSRQ=y
437CONFIG_ASYNC_RAID6_TEST=m 483CONFIG_ASYNC_RAID6_TEST=m
438CONFIG_TEST_STRING_HELPERS=m 484CONFIG_TEST_STRING_HELPERS=m
485CONFIG_TEST_KSTRTOX=m
486CONFIG_TEST_LKM=m
487CONFIG_TEST_USER_COPY=m
488CONFIG_TEST_BPF=m
489CONFIG_TEST_FIRMWARE=m
490CONFIG_TEST_UDELAY=m
491CONFIG_EARLY_PRINTK=y
439CONFIG_ENCRYPTED_KEYS=m 492CONFIG_ENCRYPTED_KEYS=m
440CONFIG_CRYPTO_MANAGER=y 493CONFIG_CRYPTO_MANAGER=y
441CONFIG_CRYPTO_USER=m 494CONFIG_CRYPTO_USER=m
442CONFIG_CRYPTO_CRYPTD=m 495CONFIG_CRYPTO_CRYPTD=m
496CONFIG_CRYPTO_MCRYPTD=m
443CONFIG_CRYPTO_TEST=m 497CONFIG_CRYPTO_TEST=m
444CONFIG_CRYPTO_CCM=m 498CONFIG_CRYPTO_CCM=m
445CONFIG_CRYPTO_GCM=m 499CONFIG_CRYPTO_GCM=m
@@ -474,13 +528,10 @@ CONFIG_CRYPTO_LZO=m
474CONFIG_CRYPTO_LZ4=m 528CONFIG_CRYPTO_LZ4=m
475CONFIG_CRYPTO_LZ4HC=m 529CONFIG_CRYPTO_LZ4HC=m
476# CONFIG_CRYPTO_ANSI_CPRNG is not set 530# CONFIG_CRYPTO_ANSI_CPRNG is not set
531CONFIG_CRYPTO_DRBG_MENU=m
532CONFIG_CRYPTO_DRBG_HASH=y
533CONFIG_CRYPTO_DRBG_CTR=y
477CONFIG_CRYPTO_USER_API_HASH=m 534CONFIG_CRYPTO_USER_API_HASH=m
478CONFIG_CRYPTO_USER_API_SKCIPHER=m 535CONFIG_CRYPTO_USER_API_SKCIPHER=m
479# CONFIG_CRYPTO_HW is not set 536# CONFIG_CRYPTO_HW is not set
480CONFIG_XZ_DEC_X86=y
481CONFIG_XZ_DEC_POWERPC=y
482CONFIG_XZ_DEC_IA64=y
483CONFIG_XZ_DEC_ARM=y
484CONFIG_XZ_DEC_ARMTHUMB=y
485CONFIG_XZ_DEC_SPARC=y
486CONFIG_XZ_DEC_TEST=m 537CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 3d345641d5a0..89f225c01a0b 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -33,6 +33,7 @@ CONFIG_M68KFPU_EMU=y
33CONFIG_MAC=y 33CONFIG_MAC=y
34# CONFIG_COMPACTION is not set 34# CONFIG_COMPACTION is not set
35CONFIG_CLEANCACHE=y 35CONFIG_CLEANCACHE=y
36CONFIG_ZPOOL=m
36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 37# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
37CONFIG_BINFMT_AOUT=m 38CONFIG_BINFMT_AOUT=m
38CONFIG_BINFMT_MISC=m 39CONFIG_BINFMT_MISC=m
@@ -52,6 +53,8 @@ CONFIG_NET_IPIP=m
52CONFIG_NET_IPGRE_DEMUX=m 53CONFIG_NET_IPGRE_DEMUX=m
53CONFIG_NET_IPGRE=m 54CONFIG_NET_IPGRE=m
54CONFIG_NET_IPVTI=m 55CONFIG_NET_IPVTI=m
56CONFIG_NET_FOU_IP_TUNNELS=y
57CONFIG_GENEVE=m
55CONFIG_INET_AH=m 58CONFIG_INET_AH=m
56CONFIG_INET_ESP=m 59CONFIG_INET_ESP=m
57CONFIG_INET_IPCOMP=m 60CONFIG_INET_IPCOMP=m
@@ -93,6 +96,8 @@ CONFIG_NFT_HASH=m
93CONFIG_NFT_COUNTER=m 96CONFIG_NFT_COUNTER=m
94CONFIG_NFT_LOG=m 97CONFIG_NFT_LOG=m
95CONFIG_NFT_LIMIT=m 98CONFIG_NFT_LIMIT=m
99CONFIG_NFT_MASQ=m
100CONFIG_NFT_REDIR=m
96CONFIG_NFT_NAT=m 101CONFIG_NFT_NAT=m
97CONFIG_NFT_QUEUE=m 102CONFIG_NFT_QUEUE=m
98CONFIG_NFT_REJECT=m 103CONFIG_NFT_REJECT=m
@@ -139,6 +144,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
139CONFIG_NETFILTER_XT_MATCH_OSF=m 144CONFIG_NETFILTER_XT_MATCH_OSF=m
140CONFIG_NETFILTER_XT_MATCH_OWNER=m 145CONFIG_NETFILTER_XT_MATCH_OWNER=m
141CONFIG_NETFILTER_XT_MATCH_POLICY=m 146CONFIG_NETFILTER_XT_MATCH_POLICY=m
147CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
142CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 148CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
143CONFIG_NETFILTER_XT_MATCH_QUOTA=m 149CONFIG_NETFILTER_XT_MATCH_QUOTA=m
144CONFIG_NETFILTER_XT_MATCH_RATEEST=m 150CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -160,6 +166,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
160CONFIG_IP_SET_HASH_IPPORT=m 166CONFIG_IP_SET_HASH_IPPORT=m
161CONFIG_IP_SET_HASH_IPPORTIP=m 167CONFIG_IP_SET_HASH_IPPORTIP=m
162CONFIG_IP_SET_HASH_IPPORTNET=m 168CONFIG_IP_SET_HASH_IPPORTNET=m
169CONFIG_IP_SET_HASH_MAC=m
163CONFIG_IP_SET_HASH_NETPORTNET=m 170CONFIG_IP_SET_HASH_NETPORTNET=m
164CONFIG_IP_SET_HASH_NET=m 171CONFIG_IP_SET_HASH_NET=m
165CONFIG_IP_SET_HASH_NETNET=m 172CONFIG_IP_SET_HASH_NETNET=m
@@ -167,9 +174,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
167CONFIG_IP_SET_HASH_NETIFACE=m 174CONFIG_IP_SET_HASH_NETIFACE=m
168CONFIG_IP_SET_LIST_SET=m 175CONFIG_IP_SET_LIST_SET=m
169CONFIG_NF_CONNTRACK_IPV4=m 176CONFIG_NF_CONNTRACK_IPV4=m
177CONFIG_NF_LOG_ARP=m
170CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178CONFIG_NFT_CHAIN_ROUTE_IPV4=m
171CONFIG_NFT_CHAIN_NAT_IPV4=m
172CONFIG_NF_TABLES_ARP=m 179CONFIG_NF_TABLES_ARP=m
180CONFIG_NFT_CHAIN_NAT_IPV4=m
181CONFIG_NFT_MASQ_IPV4=m
182CONFIG_NFT_REDIR_IPV4=m
173CONFIG_IP_NF_IPTABLES=m 183CONFIG_IP_NF_IPTABLES=m
174CONFIG_IP_NF_MATCH_AH=m 184CONFIG_IP_NF_MATCH_AH=m
175CONFIG_IP_NF_MATCH_ECN=m 185CONFIG_IP_NF_MATCH_ECN=m
@@ -178,8 +188,7 @@ CONFIG_IP_NF_MATCH_TTL=m
178CONFIG_IP_NF_FILTER=m 188CONFIG_IP_NF_FILTER=m
179CONFIG_IP_NF_TARGET_REJECT=m 189CONFIG_IP_NF_TARGET_REJECT=m
180CONFIG_IP_NF_TARGET_SYNPROXY=m 190CONFIG_IP_NF_TARGET_SYNPROXY=m
181CONFIG_IP_NF_TARGET_ULOG=m 191CONFIG_IP_NF_NAT=m
182CONFIG_NF_NAT_IPV4=m
183CONFIG_IP_NF_TARGET_MASQUERADE=m 192CONFIG_IP_NF_TARGET_MASQUERADE=m
184CONFIG_IP_NF_TARGET_NETMAP=m 193CONFIG_IP_NF_TARGET_NETMAP=m
185CONFIG_IP_NF_TARGET_REDIRECT=m 194CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -194,6 +203,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
194CONFIG_NF_CONNTRACK_IPV6=m 203CONFIG_NF_CONNTRACK_IPV6=m
195CONFIG_NFT_CHAIN_ROUTE_IPV6=m 204CONFIG_NFT_CHAIN_ROUTE_IPV6=m
196CONFIG_NFT_CHAIN_NAT_IPV6=m 205CONFIG_NFT_CHAIN_NAT_IPV6=m
206CONFIG_NFT_MASQ_IPV6=m
207CONFIG_NFT_REDIR_IPV6=m
197CONFIG_IP6_NF_IPTABLES=m 208CONFIG_IP6_NF_IPTABLES=m
198CONFIG_IP6_NF_MATCH_AH=m 209CONFIG_IP6_NF_MATCH_AH=m
199CONFIG_IP6_NF_MATCH_EUI64=m 210CONFIG_IP6_NF_MATCH_EUI64=m
@@ -210,20 +221,46 @@ CONFIG_IP6_NF_TARGET_REJECT=m
210CONFIG_IP6_NF_TARGET_SYNPROXY=m 221CONFIG_IP6_NF_TARGET_SYNPROXY=m
211CONFIG_IP6_NF_MANGLE=m 222CONFIG_IP6_NF_MANGLE=m
212CONFIG_IP6_NF_RAW=m 223CONFIG_IP6_NF_RAW=m
213CONFIG_NF_NAT_IPV6=m 224CONFIG_IP6_NF_NAT=m
214CONFIG_IP6_NF_TARGET_MASQUERADE=m 225CONFIG_IP6_NF_TARGET_MASQUERADE=m
215CONFIG_IP6_NF_TARGET_NPT=m 226CONFIG_IP6_NF_TARGET_NPT=m
216CONFIG_NF_TABLES_BRIDGE=m 227CONFIG_NF_TABLES_BRIDGE=m
228CONFIG_NFT_BRIDGE_META=m
229CONFIG_NFT_BRIDGE_REJECT=m
230CONFIG_NF_LOG_BRIDGE=m
231CONFIG_BRIDGE_NF_EBTABLES=m
232CONFIG_BRIDGE_EBT_BROUTE=m
233CONFIG_BRIDGE_EBT_T_FILTER=m
234CONFIG_BRIDGE_EBT_T_NAT=m
235CONFIG_BRIDGE_EBT_802_3=m
236CONFIG_BRIDGE_EBT_AMONG=m
237CONFIG_BRIDGE_EBT_ARP=m
238CONFIG_BRIDGE_EBT_IP=m
239CONFIG_BRIDGE_EBT_IP6=m
240CONFIG_BRIDGE_EBT_LIMIT=m
241CONFIG_BRIDGE_EBT_MARK=m
242CONFIG_BRIDGE_EBT_PKTTYPE=m
243CONFIG_BRIDGE_EBT_STP=m
244CONFIG_BRIDGE_EBT_VLAN=m
245CONFIG_BRIDGE_EBT_ARPREPLY=m
246CONFIG_BRIDGE_EBT_DNAT=m
247CONFIG_BRIDGE_EBT_MARK_T=m
248CONFIG_BRIDGE_EBT_REDIRECT=m
249CONFIG_BRIDGE_EBT_SNAT=m
250CONFIG_BRIDGE_EBT_LOG=m
251CONFIG_BRIDGE_EBT_NFLOG=m
217CONFIG_IP_DCCP=m 252CONFIG_IP_DCCP=m
218# CONFIG_IP_DCCP_CCID3 is not set 253# CONFIG_IP_DCCP_CCID3 is not set
219CONFIG_SCTP_COOKIE_HMAC_SHA1=y 254CONFIG_SCTP_COOKIE_HMAC_SHA1=y
220CONFIG_RDS=m 255CONFIG_RDS=m
221CONFIG_RDS_TCP=m 256CONFIG_RDS_TCP=m
222CONFIG_L2TP=m 257CONFIG_L2TP=m
258CONFIG_BRIDGE=m
223CONFIG_ATALK=m 259CONFIG_ATALK=m
224CONFIG_DEV_APPLETALK=m 260CONFIG_DEV_APPLETALK=m
225CONFIG_IPDDP=m 261CONFIG_IPDDP=m
226CONFIG_IPDDP_ENCAP=y 262CONFIG_IPDDP_ENCAP=y
263CONFIG_6LOWPAN=m
227CONFIG_DNS_RESOLVER=y 264CONFIG_DNS_RESOLVER=y
228CONFIG_BATMAN_ADV=m 265CONFIG_BATMAN_ADV=m
229CONFIG_BATMAN_ADV_DAT=y 266CONFIG_BATMAN_ADV_DAT=y
@@ -232,9 +269,10 @@ CONFIG_BATMAN_ADV_MCAST=y
232CONFIG_NETLINK_DIAG=m 269CONFIG_NETLINK_DIAG=m
233CONFIG_NET_MPLS_GSO=m 270CONFIG_NET_MPLS_GSO=m
234# CONFIG_WIRELESS is not set 271# CONFIG_WIRELESS is not set
272# CONFIG_UEVENT_HELPER is not set
235CONFIG_DEVTMPFS=y 273CONFIG_DEVTMPFS=y
274CONFIG_DEVTMPFS_MOUNT=y
236# CONFIG_FIRMWARE_IN_KERNEL is not set 275# CONFIG_FIRMWARE_IN_KERNEL is not set
237# CONFIG_FW_LOADER_USER_HELPER is not set
238CONFIG_CONNECTOR=m 276CONFIG_CONNECTOR=m
239CONFIG_BLK_DEV_SWIM=m 277CONFIG_BLK_DEV_SWIM=m
240CONFIG_BLK_DEV_LOOP=y 278CONFIG_BLK_DEV_LOOP=y
@@ -297,6 +335,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
297CONFIG_NET_TEAM_MODE_RANDOM=m 335CONFIG_NET_TEAM_MODE_RANDOM=m
298CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 336CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
299CONFIG_NET_TEAM_MODE_LOADBALANCE=m 337CONFIG_NET_TEAM_MODE_LOADBALANCE=m
338CONFIG_MACVLAN=m
339CONFIG_MACVTAP=m
340CONFIG_IPVLAN=m
300CONFIG_VXLAN=m 341CONFIG_VXLAN=m
301CONFIG_NETCONSOLE=m 342CONFIG_NETCONSOLE=m
302CONFIG_NETCONSOLE_DYNAMIC=y 343CONFIG_NETCONSOLE_DYNAMIC=y
@@ -310,6 +351,8 @@ CONFIG_MAC89x0=y
310# CONFIG_NET_VENDOR_MICREL is not set 351# CONFIG_NET_VENDOR_MICREL is not set
311CONFIG_MACSONIC=y 352CONFIG_MACSONIC=y
312CONFIG_MAC8390=y 353CONFIG_MAC8390=y
354# CONFIG_NET_VENDOR_QUALCOMM is not set
355# CONFIG_NET_VENDOR_ROCKER is not set
313# CONFIG_NET_VENDOR_SAMSUNG is not set 356# CONFIG_NET_VENDOR_SAMSUNG is not set
314# CONFIG_NET_VENDOR_SEEQ is not set 357# CONFIG_NET_VENDOR_SEEQ is not set
315# CONFIG_NET_VENDOR_SMSC is not set 358# CONFIG_NET_VENDOR_SMSC is not set
@@ -357,6 +400,7 @@ CONFIG_HID=m
357CONFIG_HIDRAW=y 400CONFIG_HIDRAW=y
358CONFIG_UHID=m 401CONFIG_UHID=m
359# CONFIG_HID_GENERIC is not set 402# CONFIG_HID_GENERIC is not set
403# CONFIG_HID_PLANTRONICS is not set
360# CONFIG_USB_SUPPORT is not set 404# CONFIG_USB_SUPPORT is not set
361CONFIG_RTC_CLASS=y 405CONFIG_RTC_CLASS=y
362CONFIG_RTC_DRV_GENERIC=m 406CONFIG_RTC_DRV_GENERIC=m
@@ -374,6 +418,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
374CONFIG_AUTOFS4_FS=m 418CONFIG_AUTOFS4_FS=m
375CONFIG_FUSE_FS=m 419CONFIG_FUSE_FS=m
376CONFIG_CUSE=m 420CONFIG_CUSE=m
421CONFIG_OVERLAY_FS=m
377CONFIG_ISO9660_FS=y 422CONFIG_ISO9660_FS=y
378CONFIG_JOLIET=y 423CONFIG_JOLIET=y
379CONFIG_ZISOFS=y 424CONFIG_ZISOFS=y
@@ -389,6 +434,7 @@ CONFIG_HFS_FS=m
389CONFIG_HFSPLUS_FS=m 434CONFIG_HFSPLUS_FS=m
390CONFIG_CRAMFS=m 435CONFIG_CRAMFS=m
391CONFIG_SQUASHFS=m 436CONFIG_SQUASHFS=m
437CONFIG_SQUASHFS_LZ4=y
392CONFIG_SQUASHFS_LZO=y 438CONFIG_SQUASHFS_LZO=y
393CONFIG_MINIX_FS=m 439CONFIG_MINIX_FS=m
394CONFIG_OMFS_FS=m 440CONFIG_OMFS_FS=m
@@ -458,11 +504,18 @@ CONFIG_DLM=m
458CONFIG_MAGIC_SYSRQ=y 504CONFIG_MAGIC_SYSRQ=y
459CONFIG_ASYNC_RAID6_TEST=m 505CONFIG_ASYNC_RAID6_TEST=m
460CONFIG_TEST_STRING_HELPERS=m 506CONFIG_TEST_STRING_HELPERS=m
507CONFIG_TEST_KSTRTOX=m
508CONFIG_TEST_LKM=m
509CONFIG_TEST_USER_COPY=m
510CONFIG_TEST_BPF=m
511CONFIG_TEST_FIRMWARE=m
512CONFIG_TEST_UDELAY=m
461CONFIG_EARLY_PRINTK=y 513CONFIG_EARLY_PRINTK=y
462CONFIG_ENCRYPTED_KEYS=m 514CONFIG_ENCRYPTED_KEYS=m
463CONFIG_CRYPTO_MANAGER=y 515CONFIG_CRYPTO_MANAGER=y
464CONFIG_CRYPTO_USER=m 516CONFIG_CRYPTO_USER=m
465CONFIG_CRYPTO_CRYPTD=m 517CONFIG_CRYPTO_CRYPTD=m
518CONFIG_CRYPTO_MCRYPTD=m
466CONFIG_CRYPTO_TEST=m 519CONFIG_CRYPTO_TEST=m
467CONFIG_CRYPTO_CCM=m 520CONFIG_CRYPTO_CCM=m
468CONFIG_CRYPTO_GCM=m 521CONFIG_CRYPTO_GCM=m
@@ -497,13 +550,10 @@ CONFIG_CRYPTO_LZO=m
497CONFIG_CRYPTO_LZ4=m 550CONFIG_CRYPTO_LZ4=m
498CONFIG_CRYPTO_LZ4HC=m 551CONFIG_CRYPTO_LZ4HC=m
499# CONFIG_CRYPTO_ANSI_CPRNG is not set 552# CONFIG_CRYPTO_ANSI_CPRNG is not set
553CONFIG_CRYPTO_DRBG_MENU=m
554CONFIG_CRYPTO_DRBG_HASH=y
555CONFIG_CRYPTO_DRBG_CTR=y
500CONFIG_CRYPTO_USER_API_HASH=m 556CONFIG_CRYPTO_USER_API_HASH=m
501CONFIG_CRYPTO_USER_API_SKCIPHER=m 557CONFIG_CRYPTO_USER_API_SKCIPHER=m
502# CONFIG_CRYPTO_HW is not set 558# CONFIG_CRYPTO_HW is not set
503CONFIG_XZ_DEC_X86=y
504CONFIG_XZ_DEC_POWERPC=y
505CONFIG_XZ_DEC_IA64=y
506CONFIG_XZ_DEC_ARM=y
507CONFIG_XZ_DEC_ARMTHUMB=y
508CONFIG_XZ_DEC_SPARC=y
509CONFIG_XZ_DEC_TEST=m 559CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 59aa42096000..d3cdb5447a2c 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -39,9 +39,11 @@ CONFIG_SUN3X=y
39CONFIG_Q40=y 39CONFIG_Q40=y
40CONFIG_ZORRO=y 40CONFIG_ZORRO=y
41CONFIG_AMIGA_PCMCIA=y 41CONFIG_AMIGA_PCMCIA=y
42CONFIG_ATARI_ROM_ISA=y
42CONFIG_ZORRO_NAMES=y 43CONFIG_ZORRO_NAMES=y
43# CONFIG_COMPACTION is not set 44# CONFIG_COMPACTION is not set
44CONFIG_CLEANCACHE=y 45CONFIG_CLEANCACHE=y
46CONFIG_ZPOOL=m
45# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 47# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46CONFIG_BINFMT_AOUT=m 48CONFIG_BINFMT_AOUT=m
47CONFIG_BINFMT_MISC=m 49CONFIG_BINFMT_MISC=m
@@ -61,6 +63,8 @@ CONFIG_NET_IPIP=m
61CONFIG_NET_IPGRE_DEMUX=m 63CONFIG_NET_IPGRE_DEMUX=m
62CONFIG_NET_IPGRE=m 64CONFIG_NET_IPGRE=m
63CONFIG_NET_IPVTI=m 65CONFIG_NET_IPVTI=m
66CONFIG_NET_FOU_IP_TUNNELS=y
67CONFIG_GENEVE=m
64CONFIG_INET_AH=m 68CONFIG_INET_AH=m
65CONFIG_INET_ESP=m 69CONFIG_INET_ESP=m
66CONFIG_INET_IPCOMP=m 70CONFIG_INET_IPCOMP=m
@@ -102,6 +106,8 @@ CONFIG_NFT_HASH=m
102CONFIG_NFT_COUNTER=m 106CONFIG_NFT_COUNTER=m
103CONFIG_NFT_LOG=m 107CONFIG_NFT_LOG=m
104CONFIG_NFT_LIMIT=m 108CONFIG_NFT_LIMIT=m
109CONFIG_NFT_MASQ=m
110CONFIG_NFT_REDIR=m
105CONFIG_NFT_NAT=m 111CONFIG_NFT_NAT=m
106CONFIG_NFT_QUEUE=m 112CONFIG_NFT_QUEUE=m
107CONFIG_NFT_REJECT=m 113CONFIG_NFT_REJECT=m
@@ -148,6 +154,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
148CONFIG_NETFILTER_XT_MATCH_OSF=m 154CONFIG_NETFILTER_XT_MATCH_OSF=m
149CONFIG_NETFILTER_XT_MATCH_OWNER=m 155CONFIG_NETFILTER_XT_MATCH_OWNER=m
150CONFIG_NETFILTER_XT_MATCH_POLICY=m 156CONFIG_NETFILTER_XT_MATCH_POLICY=m
157CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
151CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 158CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
152CONFIG_NETFILTER_XT_MATCH_QUOTA=m 159CONFIG_NETFILTER_XT_MATCH_QUOTA=m
153CONFIG_NETFILTER_XT_MATCH_RATEEST=m 160CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -169,6 +176,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
169CONFIG_IP_SET_HASH_IPPORT=m 176CONFIG_IP_SET_HASH_IPPORT=m
170CONFIG_IP_SET_HASH_IPPORTIP=m 177CONFIG_IP_SET_HASH_IPPORTIP=m
171CONFIG_IP_SET_HASH_IPPORTNET=m 178CONFIG_IP_SET_HASH_IPPORTNET=m
179CONFIG_IP_SET_HASH_MAC=m
172CONFIG_IP_SET_HASH_NETPORTNET=m 180CONFIG_IP_SET_HASH_NETPORTNET=m
173CONFIG_IP_SET_HASH_NET=m 181CONFIG_IP_SET_HASH_NET=m
174CONFIG_IP_SET_HASH_NETNET=m 182CONFIG_IP_SET_HASH_NETNET=m
@@ -176,9 +184,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
176CONFIG_IP_SET_HASH_NETIFACE=m 184CONFIG_IP_SET_HASH_NETIFACE=m
177CONFIG_IP_SET_LIST_SET=m 185CONFIG_IP_SET_LIST_SET=m
178CONFIG_NF_CONNTRACK_IPV4=m 186CONFIG_NF_CONNTRACK_IPV4=m
187CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_ROUTE_IPV4=m 188CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180CONFIG_NFT_CHAIN_NAT_IPV4=m
181CONFIG_NF_TABLES_ARP=m 189CONFIG_NF_TABLES_ARP=m
190CONFIG_NFT_CHAIN_NAT_IPV4=m
191CONFIG_NFT_MASQ_IPV4=m
192CONFIG_NFT_REDIR_IPV4=m
182CONFIG_IP_NF_IPTABLES=m 193CONFIG_IP_NF_IPTABLES=m
183CONFIG_IP_NF_MATCH_AH=m 194CONFIG_IP_NF_MATCH_AH=m
184CONFIG_IP_NF_MATCH_ECN=m 195CONFIG_IP_NF_MATCH_ECN=m
@@ -187,8 +198,7 @@ CONFIG_IP_NF_MATCH_TTL=m
187CONFIG_IP_NF_FILTER=m 198CONFIG_IP_NF_FILTER=m
188CONFIG_IP_NF_TARGET_REJECT=m 199CONFIG_IP_NF_TARGET_REJECT=m
189CONFIG_IP_NF_TARGET_SYNPROXY=m 200CONFIG_IP_NF_TARGET_SYNPROXY=m
190CONFIG_IP_NF_TARGET_ULOG=m 201CONFIG_IP_NF_NAT=m
191CONFIG_NF_NAT_IPV4=m
192CONFIG_IP_NF_TARGET_MASQUERADE=m 202CONFIG_IP_NF_TARGET_MASQUERADE=m
193CONFIG_IP_NF_TARGET_NETMAP=m 203CONFIG_IP_NF_TARGET_NETMAP=m
194CONFIG_IP_NF_TARGET_REDIRECT=m 204CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -203,6 +213,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
203CONFIG_NF_CONNTRACK_IPV6=m 213CONFIG_NF_CONNTRACK_IPV6=m
204CONFIG_NFT_CHAIN_ROUTE_IPV6=m 214CONFIG_NFT_CHAIN_ROUTE_IPV6=m
205CONFIG_NFT_CHAIN_NAT_IPV6=m 215CONFIG_NFT_CHAIN_NAT_IPV6=m
216CONFIG_NFT_MASQ_IPV6=m
217CONFIG_NFT_REDIR_IPV6=m
206CONFIG_IP6_NF_IPTABLES=m 218CONFIG_IP6_NF_IPTABLES=m
207CONFIG_IP6_NF_MATCH_AH=m 219CONFIG_IP6_NF_MATCH_AH=m
208CONFIG_IP6_NF_MATCH_EUI64=m 220CONFIG_IP6_NF_MATCH_EUI64=m
@@ -219,20 +231,46 @@ CONFIG_IP6_NF_TARGET_REJECT=m
219CONFIG_IP6_NF_TARGET_SYNPROXY=m 231CONFIG_IP6_NF_TARGET_SYNPROXY=m
220CONFIG_IP6_NF_MANGLE=m 232CONFIG_IP6_NF_MANGLE=m
221CONFIG_IP6_NF_RAW=m 233CONFIG_IP6_NF_RAW=m
222CONFIG_NF_NAT_IPV6=m 234CONFIG_IP6_NF_NAT=m
223CONFIG_IP6_NF_TARGET_MASQUERADE=m 235CONFIG_IP6_NF_TARGET_MASQUERADE=m
224CONFIG_IP6_NF_TARGET_NPT=m 236CONFIG_IP6_NF_TARGET_NPT=m
225CONFIG_NF_TABLES_BRIDGE=m 237CONFIG_NF_TABLES_BRIDGE=m
238CONFIG_NFT_BRIDGE_META=m
239CONFIG_NFT_BRIDGE_REJECT=m
240CONFIG_NF_LOG_BRIDGE=m
241CONFIG_BRIDGE_NF_EBTABLES=m
242CONFIG_BRIDGE_EBT_BROUTE=m
243CONFIG_BRIDGE_EBT_T_FILTER=m
244CONFIG_BRIDGE_EBT_T_NAT=m
245CONFIG_BRIDGE_EBT_802_3=m
246CONFIG_BRIDGE_EBT_AMONG=m
247CONFIG_BRIDGE_EBT_ARP=m
248CONFIG_BRIDGE_EBT_IP=m
249CONFIG_BRIDGE_EBT_IP6=m
250CONFIG_BRIDGE_EBT_LIMIT=m
251CONFIG_BRIDGE_EBT_MARK=m
252CONFIG_BRIDGE_EBT_PKTTYPE=m
253CONFIG_BRIDGE_EBT_STP=m
254CONFIG_BRIDGE_EBT_VLAN=m
255CONFIG_BRIDGE_EBT_ARPREPLY=m
256CONFIG_BRIDGE_EBT_DNAT=m
257CONFIG_BRIDGE_EBT_MARK_T=m
258CONFIG_BRIDGE_EBT_REDIRECT=m
259CONFIG_BRIDGE_EBT_SNAT=m
260CONFIG_BRIDGE_EBT_LOG=m
261CONFIG_BRIDGE_EBT_NFLOG=m
226CONFIG_IP_DCCP=m 262CONFIG_IP_DCCP=m
227# CONFIG_IP_DCCP_CCID3 is not set 263# CONFIG_IP_DCCP_CCID3 is not set
228CONFIG_SCTP_COOKIE_HMAC_SHA1=y 264CONFIG_SCTP_COOKIE_HMAC_SHA1=y
229CONFIG_RDS=m 265CONFIG_RDS=m
230CONFIG_RDS_TCP=m 266CONFIG_RDS_TCP=m
231CONFIG_L2TP=m 267CONFIG_L2TP=m
268CONFIG_BRIDGE=m
232CONFIG_ATALK=m 269CONFIG_ATALK=m
233CONFIG_DEV_APPLETALK=m 270CONFIG_DEV_APPLETALK=m
234CONFIG_IPDDP=m 271CONFIG_IPDDP=m
235CONFIG_IPDDP_ENCAP=y 272CONFIG_IPDDP_ENCAP=y
273CONFIG_6LOWPAN=m
236CONFIG_DNS_RESOLVER=y 274CONFIG_DNS_RESOLVER=y
237CONFIG_BATMAN_ADV=m 275CONFIG_BATMAN_ADV=m
238CONFIG_BATMAN_ADV_DAT=y 276CONFIG_BATMAN_ADV_DAT=y
@@ -241,9 +279,10 @@ CONFIG_BATMAN_ADV_MCAST=y
241CONFIG_NETLINK_DIAG=m 279CONFIG_NETLINK_DIAG=m
242CONFIG_NET_MPLS_GSO=m 280CONFIG_NET_MPLS_GSO=m
243# CONFIG_WIRELESS is not set 281# CONFIG_WIRELESS is not set
282# CONFIG_UEVENT_HELPER is not set
244CONFIG_DEVTMPFS=y 283CONFIG_DEVTMPFS=y
284CONFIG_DEVTMPFS_MOUNT=y
245# CONFIG_FIRMWARE_IN_KERNEL is not set 285# CONFIG_FIRMWARE_IN_KERNEL is not set
246# CONFIG_FW_LOADER_USER_HELPER is not set
247CONFIG_CONNECTOR=m 286CONFIG_CONNECTOR=m
248CONFIG_PARPORT=m 287CONFIG_PARPORT=m
249CONFIG_PARPORT_PC=m 288CONFIG_PARPORT_PC=m
@@ -329,6 +368,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
329CONFIG_NET_TEAM_MODE_RANDOM=m 368CONFIG_NET_TEAM_MODE_RANDOM=m
330CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 369CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
331CONFIG_NET_TEAM_MODE_LOADBALANCE=m 370CONFIG_NET_TEAM_MODE_LOADBALANCE=m
371CONFIG_MACVLAN=m
372CONFIG_MACVTAP=m
373CONFIG_IPVLAN=m
332CONFIG_VXLAN=m 374CONFIG_VXLAN=m
333CONFIG_NETCONSOLE=m 375CONFIG_NETCONSOLE=m
334CONFIG_NETCONSOLE_DYNAMIC=y 376CONFIG_NETCONSOLE_DYNAMIC=y
@@ -352,11 +394,14 @@ CONFIG_MVME16x_NET=y
352CONFIG_MACSONIC=y 394CONFIG_MACSONIC=y
353CONFIG_HYDRA=y 395CONFIG_HYDRA=y
354CONFIG_MAC8390=y 396CONFIG_MAC8390=y
355CONFIG_NE2000=m 397CONFIG_NE2000=y
356CONFIG_APNE=y 398CONFIG_APNE=y
357CONFIG_ZORRO8390=y 399CONFIG_ZORRO8390=y
400# CONFIG_NET_VENDOR_QUALCOMM is not set
401# CONFIG_NET_VENDOR_ROCKER is not set
358# CONFIG_NET_VENDOR_SAMSUNG is not set 402# CONFIG_NET_VENDOR_SAMSUNG is not set
359# CONFIG_NET_VENDOR_SEEQ is not set 403# CONFIG_NET_VENDOR_SEEQ is not set
404CONFIG_SMC91X=y
360# CONFIG_NET_VENDOR_STMICRO is not set 405# CONFIG_NET_VENDOR_STMICRO is not set
361# CONFIG_NET_VENDOR_VIA is not set 406# CONFIG_NET_VENDOR_VIA is not set
362# CONFIG_NET_VENDOR_WIZNET is not set 407# CONFIG_NET_VENDOR_WIZNET is not set
@@ -423,6 +468,7 @@ CONFIG_HID=m
423CONFIG_HIDRAW=y 468CONFIG_HIDRAW=y
424CONFIG_UHID=m 469CONFIG_UHID=m
425# CONFIG_HID_GENERIC is not set 470# CONFIG_HID_GENERIC is not set
471# CONFIG_HID_PLANTRONICS is not set
426# CONFIG_USB_SUPPORT is not set 472# CONFIG_USB_SUPPORT is not set
427CONFIG_RTC_CLASS=y 473CONFIG_RTC_CLASS=y
428CONFIG_RTC_DRV_MSM6242=m 474CONFIG_RTC_DRV_MSM6242=m
@@ -435,6 +481,8 @@ CONFIG_NATFEAT=y
435CONFIG_NFBLOCK=y 481CONFIG_NFBLOCK=y
436CONFIG_NFCON=y 482CONFIG_NFCON=y
437CONFIG_NFETH=y 483CONFIG_NFETH=y
484CONFIG_ATARI_ETHERNAT=y
485CONFIG_ATARI_ETHERNEC=y
438CONFIG_ATARI_DSP56K=m 486CONFIG_ATARI_DSP56K=m
439CONFIG_AMIGA_BUILTIN_SERIAL=y 487CONFIG_AMIGA_BUILTIN_SERIAL=y
440CONFIG_SERIAL_CONSOLE=y 488CONFIG_SERIAL_CONSOLE=y
@@ -450,6 +498,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
450CONFIG_AUTOFS4_FS=m 498CONFIG_AUTOFS4_FS=m
451CONFIG_FUSE_FS=m 499CONFIG_FUSE_FS=m
452CONFIG_CUSE=m 500CONFIG_CUSE=m
501CONFIG_OVERLAY_FS=m
453CONFIG_ISO9660_FS=y 502CONFIG_ISO9660_FS=y
454CONFIG_JOLIET=y 503CONFIG_JOLIET=y
455CONFIG_ZISOFS=y 504CONFIG_ZISOFS=y
@@ -465,6 +514,7 @@ CONFIG_HFS_FS=m
465CONFIG_HFSPLUS_FS=m 514CONFIG_HFSPLUS_FS=m
466CONFIG_CRAMFS=m 515CONFIG_CRAMFS=m
467CONFIG_SQUASHFS=m 516CONFIG_SQUASHFS=m
517CONFIG_SQUASHFS_LZ4=y
468CONFIG_SQUASHFS_LZO=y 518CONFIG_SQUASHFS_LZO=y
469CONFIG_MINIX_FS=m 519CONFIG_MINIX_FS=m
470CONFIG_OMFS_FS=m 520CONFIG_OMFS_FS=m
@@ -534,11 +584,18 @@ CONFIG_DLM=m
534CONFIG_MAGIC_SYSRQ=y 584CONFIG_MAGIC_SYSRQ=y
535CONFIG_ASYNC_RAID6_TEST=m 585CONFIG_ASYNC_RAID6_TEST=m
536CONFIG_TEST_STRING_HELPERS=m 586CONFIG_TEST_STRING_HELPERS=m
587CONFIG_TEST_KSTRTOX=m
588CONFIG_TEST_LKM=m
589CONFIG_TEST_USER_COPY=m
590CONFIG_TEST_BPF=m
591CONFIG_TEST_FIRMWARE=m
592CONFIG_TEST_UDELAY=m
537CONFIG_EARLY_PRINTK=y 593CONFIG_EARLY_PRINTK=y
538CONFIG_ENCRYPTED_KEYS=m 594CONFIG_ENCRYPTED_KEYS=m
539CONFIG_CRYPTO_MANAGER=y 595CONFIG_CRYPTO_MANAGER=y
540CONFIG_CRYPTO_USER=m 596CONFIG_CRYPTO_USER=m
541CONFIG_CRYPTO_CRYPTD=m 597CONFIG_CRYPTO_CRYPTD=m
598CONFIG_CRYPTO_MCRYPTD=m
542CONFIG_CRYPTO_TEST=m 599CONFIG_CRYPTO_TEST=m
543CONFIG_CRYPTO_CCM=m 600CONFIG_CRYPTO_CCM=m
544CONFIG_CRYPTO_GCM=m 601CONFIG_CRYPTO_GCM=m
@@ -573,13 +630,10 @@ CONFIG_CRYPTO_LZO=m
573CONFIG_CRYPTO_LZ4=m 630CONFIG_CRYPTO_LZ4=m
574CONFIG_CRYPTO_LZ4HC=m 631CONFIG_CRYPTO_LZ4HC=m
575# CONFIG_CRYPTO_ANSI_CPRNG is not set 632# CONFIG_CRYPTO_ANSI_CPRNG is not set
633CONFIG_CRYPTO_DRBG_MENU=m
634CONFIG_CRYPTO_DRBG_HASH=y
635CONFIG_CRYPTO_DRBG_CTR=y
576CONFIG_CRYPTO_USER_API_HASH=m 636CONFIG_CRYPTO_USER_API_HASH=m
577CONFIG_CRYPTO_USER_API_SKCIPHER=m 637CONFIG_CRYPTO_USER_API_SKCIPHER=m
578# CONFIG_CRYPTO_HW is not set 638# CONFIG_CRYPTO_HW is not set
579CONFIG_XZ_DEC_X86=y
580CONFIG_XZ_DEC_POWERPC=y
581CONFIG_XZ_DEC_IA64=y
582CONFIG_XZ_DEC_ARM=y
583CONFIG_XZ_DEC_ARMTHUMB=y
584CONFIG_XZ_DEC_SPARC=y
585CONFIG_XZ_DEC_TEST=m 639CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 066b24af095e..b4c76640973e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -31,6 +31,7 @@ CONFIG_VME=y
31CONFIG_MVME147=y 31CONFIG_MVME147=y
32# CONFIG_COMPACTION is not set 32# CONFIG_COMPACTION is not set
33CONFIG_CLEANCACHE=y 33CONFIG_CLEANCACHE=y
34CONFIG_ZPOOL=m
34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
35CONFIG_BINFMT_AOUT=m 36CONFIG_BINFMT_AOUT=m
36CONFIG_BINFMT_MISC=m 37CONFIG_BINFMT_MISC=m
@@ -50,6 +51,8 @@ CONFIG_NET_IPIP=m
50CONFIG_NET_IPGRE_DEMUX=m 51CONFIG_NET_IPGRE_DEMUX=m
51CONFIG_NET_IPGRE=m 52CONFIG_NET_IPGRE=m
52CONFIG_NET_IPVTI=m 53CONFIG_NET_IPVTI=m
54CONFIG_NET_FOU_IP_TUNNELS=y
55CONFIG_GENEVE=m
53CONFIG_INET_AH=m 56CONFIG_INET_AH=m
54CONFIG_INET_ESP=m 57CONFIG_INET_ESP=m
55CONFIG_INET_IPCOMP=m 58CONFIG_INET_IPCOMP=m
@@ -91,6 +94,8 @@ CONFIG_NFT_HASH=m
91CONFIG_NFT_COUNTER=m 94CONFIG_NFT_COUNTER=m
92CONFIG_NFT_LOG=m 95CONFIG_NFT_LOG=m
93CONFIG_NFT_LIMIT=m 96CONFIG_NFT_LIMIT=m
97CONFIG_NFT_MASQ=m
98CONFIG_NFT_REDIR=m
94CONFIG_NFT_NAT=m 99CONFIG_NFT_NAT=m
95CONFIG_NFT_QUEUE=m 100CONFIG_NFT_QUEUE=m
96CONFIG_NFT_REJECT=m 101CONFIG_NFT_REJECT=m
@@ -137,6 +142,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
137CONFIG_NETFILTER_XT_MATCH_OSF=m 142CONFIG_NETFILTER_XT_MATCH_OSF=m
138CONFIG_NETFILTER_XT_MATCH_OWNER=m 143CONFIG_NETFILTER_XT_MATCH_OWNER=m
139CONFIG_NETFILTER_XT_MATCH_POLICY=m 144CONFIG_NETFILTER_XT_MATCH_POLICY=m
145CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
140CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 146CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
141CONFIG_NETFILTER_XT_MATCH_QUOTA=m 147CONFIG_NETFILTER_XT_MATCH_QUOTA=m
142CONFIG_NETFILTER_XT_MATCH_RATEEST=m 148CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -158,6 +164,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
158CONFIG_IP_SET_HASH_IPPORT=m 164CONFIG_IP_SET_HASH_IPPORT=m
159CONFIG_IP_SET_HASH_IPPORTIP=m 165CONFIG_IP_SET_HASH_IPPORTIP=m
160CONFIG_IP_SET_HASH_IPPORTNET=m 166CONFIG_IP_SET_HASH_IPPORTNET=m
167CONFIG_IP_SET_HASH_MAC=m
161CONFIG_IP_SET_HASH_NETPORTNET=m 168CONFIG_IP_SET_HASH_NETPORTNET=m
162CONFIG_IP_SET_HASH_NET=m 169CONFIG_IP_SET_HASH_NET=m
163CONFIG_IP_SET_HASH_NETNET=m 170CONFIG_IP_SET_HASH_NETNET=m
@@ -165,9 +172,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
165CONFIG_IP_SET_HASH_NETIFACE=m 172CONFIG_IP_SET_HASH_NETIFACE=m
166CONFIG_IP_SET_LIST_SET=m 173CONFIG_IP_SET_LIST_SET=m
167CONFIG_NF_CONNTRACK_IPV4=m 174CONFIG_NF_CONNTRACK_IPV4=m
175CONFIG_NF_LOG_ARP=m
168CONFIG_NFT_CHAIN_ROUTE_IPV4=m 176CONFIG_NFT_CHAIN_ROUTE_IPV4=m
169CONFIG_NFT_CHAIN_NAT_IPV4=m
170CONFIG_NF_TABLES_ARP=m 177CONFIG_NF_TABLES_ARP=m
178CONFIG_NFT_CHAIN_NAT_IPV4=m
179CONFIG_NFT_MASQ_IPV4=m
180CONFIG_NFT_REDIR_IPV4=m
171CONFIG_IP_NF_IPTABLES=m 181CONFIG_IP_NF_IPTABLES=m
172CONFIG_IP_NF_MATCH_AH=m 182CONFIG_IP_NF_MATCH_AH=m
173CONFIG_IP_NF_MATCH_ECN=m 183CONFIG_IP_NF_MATCH_ECN=m
@@ -176,8 +186,7 @@ CONFIG_IP_NF_MATCH_TTL=m
176CONFIG_IP_NF_FILTER=m 186CONFIG_IP_NF_FILTER=m
177CONFIG_IP_NF_TARGET_REJECT=m 187CONFIG_IP_NF_TARGET_REJECT=m
178CONFIG_IP_NF_TARGET_SYNPROXY=m 188CONFIG_IP_NF_TARGET_SYNPROXY=m
179CONFIG_IP_NF_TARGET_ULOG=m 189CONFIG_IP_NF_NAT=m
180CONFIG_NF_NAT_IPV4=m
181CONFIG_IP_NF_TARGET_MASQUERADE=m 190CONFIG_IP_NF_TARGET_MASQUERADE=m
182CONFIG_IP_NF_TARGET_NETMAP=m 191CONFIG_IP_NF_TARGET_NETMAP=m
183CONFIG_IP_NF_TARGET_REDIRECT=m 192CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -192,6 +201,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
192CONFIG_NF_CONNTRACK_IPV6=m 201CONFIG_NF_CONNTRACK_IPV6=m
193CONFIG_NFT_CHAIN_ROUTE_IPV6=m 202CONFIG_NFT_CHAIN_ROUTE_IPV6=m
194CONFIG_NFT_CHAIN_NAT_IPV6=m 203CONFIG_NFT_CHAIN_NAT_IPV6=m
204CONFIG_NFT_MASQ_IPV6=m
205CONFIG_NFT_REDIR_IPV6=m
195CONFIG_IP6_NF_IPTABLES=m 206CONFIG_IP6_NF_IPTABLES=m
196CONFIG_IP6_NF_MATCH_AH=m 207CONFIG_IP6_NF_MATCH_AH=m
197CONFIG_IP6_NF_MATCH_EUI64=m 208CONFIG_IP6_NF_MATCH_EUI64=m
@@ -208,17 +219,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
208CONFIG_IP6_NF_TARGET_SYNPROXY=m 219CONFIG_IP6_NF_TARGET_SYNPROXY=m
209CONFIG_IP6_NF_MANGLE=m 220CONFIG_IP6_NF_MANGLE=m
210CONFIG_IP6_NF_RAW=m 221CONFIG_IP6_NF_RAW=m
211CONFIG_NF_NAT_IPV6=m 222CONFIG_IP6_NF_NAT=m
212CONFIG_IP6_NF_TARGET_MASQUERADE=m 223CONFIG_IP6_NF_TARGET_MASQUERADE=m
213CONFIG_IP6_NF_TARGET_NPT=m 224CONFIG_IP6_NF_TARGET_NPT=m
214CONFIG_NF_TABLES_BRIDGE=m 225CONFIG_NF_TABLES_BRIDGE=m
226CONFIG_NFT_BRIDGE_META=m
227CONFIG_NFT_BRIDGE_REJECT=m
228CONFIG_NF_LOG_BRIDGE=m
229CONFIG_BRIDGE_NF_EBTABLES=m
230CONFIG_BRIDGE_EBT_BROUTE=m
231CONFIG_BRIDGE_EBT_T_FILTER=m
232CONFIG_BRIDGE_EBT_T_NAT=m
233CONFIG_BRIDGE_EBT_802_3=m
234CONFIG_BRIDGE_EBT_AMONG=m
235CONFIG_BRIDGE_EBT_ARP=m
236CONFIG_BRIDGE_EBT_IP=m
237CONFIG_BRIDGE_EBT_IP6=m
238CONFIG_BRIDGE_EBT_LIMIT=m
239CONFIG_BRIDGE_EBT_MARK=m
240CONFIG_BRIDGE_EBT_PKTTYPE=m
241CONFIG_BRIDGE_EBT_STP=m
242CONFIG_BRIDGE_EBT_VLAN=m
243CONFIG_BRIDGE_EBT_ARPREPLY=m
244CONFIG_BRIDGE_EBT_DNAT=m
245CONFIG_BRIDGE_EBT_MARK_T=m
246CONFIG_BRIDGE_EBT_REDIRECT=m
247CONFIG_BRIDGE_EBT_SNAT=m
248CONFIG_BRIDGE_EBT_LOG=m
249CONFIG_BRIDGE_EBT_NFLOG=m
215CONFIG_IP_DCCP=m 250CONFIG_IP_DCCP=m
216# CONFIG_IP_DCCP_CCID3 is not set 251# CONFIG_IP_DCCP_CCID3 is not set
217CONFIG_SCTP_COOKIE_HMAC_SHA1=y 252CONFIG_SCTP_COOKIE_HMAC_SHA1=y
218CONFIG_RDS=m 253CONFIG_RDS=m
219CONFIG_RDS_TCP=m 254CONFIG_RDS_TCP=m
220CONFIG_L2TP=m 255CONFIG_L2TP=m
256CONFIG_BRIDGE=m
221CONFIG_ATALK=m 257CONFIG_ATALK=m
258CONFIG_6LOWPAN=m
222CONFIG_DNS_RESOLVER=y 259CONFIG_DNS_RESOLVER=y
223CONFIG_BATMAN_ADV=m 260CONFIG_BATMAN_ADV=m
224CONFIG_BATMAN_ADV_DAT=y 261CONFIG_BATMAN_ADV_DAT=y
@@ -227,9 +264,10 @@ CONFIG_BATMAN_ADV_MCAST=y
227CONFIG_NETLINK_DIAG=m 264CONFIG_NETLINK_DIAG=m
228CONFIG_NET_MPLS_GSO=m 265CONFIG_NET_MPLS_GSO=m
229# CONFIG_WIRELESS is not set 266# CONFIG_WIRELESS is not set
267# CONFIG_UEVENT_HELPER is not set
230CONFIG_DEVTMPFS=y 268CONFIG_DEVTMPFS=y
269CONFIG_DEVTMPFS_MOUNT=y
231# CONFIG_FIRMWARE_IN_KERNEL is not set 270# CONFIG_FIRMWARE_IN_KERNEL is not set
232# CONFIG_FW_LOADER_USER_HELPER is not set
233CONFIG_CONNECTOR=m 271CONFIG_CONNECTOR=m
234CONFIG_BLK_DEV_LOOP=y 272CONFIG_BLK_DEV_LOOP=y
235CONFIG_BLK_DEV_CRYPTOLOOP=m 273CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -279,6 +317,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
279CONFIG_NET_TEAM_MODE_RANDOM=m 317CONFIG_NET_TEAM_MODE_RANDOM=m
280CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 318CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
281CONFIG_NET_TEAM_MODE_LOADBALANCE=m 319CONFIG_NET_TEAM_MODE_LOADBALANCE=m
320CONFIG_MACVLAN=m
321CONFIG_MACVTAP=m
322CONFIG_IPVLAN=m
282CONFIG_VXLAN=m 323CONFIG_VXLAN=m
283CONFIG_NETCONSOLE=m 324CONFIG_NETCONSOLE=m
284CONFIG_NETCONSOLE_DYNAMIC=y 325CONFIG_NETCONSOLE_DYNAMIC=y
@@ -290,6 +331,8 @@ CONFIG_MVME147_NET=y
290# CONFIG_NET_VENDOR_MARVELL is not set 331# CONFIG_NET_VENDOR_MARVELL is not set
291# CONFIG_NET_VENDOR_MICREL is not set 332# CONFIG_NET_VENDOR_MICREL is not set
292# CONFIG_NET_VENDOR_NATSEMI is not set 333# CONFIG_NET_VENDOR_NATSEMI is not set
334# CONFIG_NET_VENDOR_QUALCOMM is not set
335# CONFIG_NET_VENDOR_ROCKER is not set
293# CONFIG_NET_VENDOR_SAMSUNG is not set 336# CONFIG_NET_VENDOR_SAMSUNG is not set
294# CONFIG_NET_VENDOR_SEEQ is not set 337# CONFIG_NET_VENDOR_SEEQ is not set
295# CONFIG_NET_VENDOR_STMICRO is not set 338# CONFIG_NET_VENDOR_STMICRO is not set
@@ -326,6 +369,7 @@ CONFIG_HID=m
326CONFIG_HIDRAW=y 369CONFIG_HIDRAW=y
327CONFIG_UHID=m 370CONFIG_UHID=m
328# CONFIG_HID_GENERIC is not set 371# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
329# CONFIG_USB_SUPPORT is not set 373# CONFIG_USB_SUPPORT is not set
330CONFIG_RTC_CLASS=y 374CONFIG_RTC_CLASS=y
331CONFIG_RTC_DRV_GENERIC=m 375CONFIG_RTC_DRV_GENERIC=m
@@ -343,6 +387,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
343CONFIG_AUTOFS4_FS=m 387CONFIG_AUTOFS4_FS=m
344CONFIG_FUSE_FS=m 388CONFIG_FUSE_FS=m
345CONFIG_CUSE=m 389CONFIG_CUSE=m
390CONFIG_OVERLAY_FS=m
346CONFIG_ISO9660_FS=y 391CONFIG_ISO9660_FS=y
347CONFIG_JOLIET=y 392CONFIG_JOLIET=y
348CONFIG_ZISOFS=y 393CONFIG_ZISOFS=y
@@ -358,6 +403,7 @@ CONFIG_HFS_FS=m
358CONFIG_HFSPLUS_FS=m 403CONFIG_HFSPLUS_FS=m
359CONFIG_CRAMFS=m 404CONFIG_CRAMFS=m
360CONFIG_SQUASHFS=m 405CONFIG_SQUASHFS=m
406CONFIG_SQUASHFS_LZ4=y
361CONFIG_SQUASHFS_LZO=y 407CONFIG_SQUASHFS_LZO=y
362CONFIG_MINIX_FS=m 408CONFIG_MINIX_FS=m
363CONFIG_OMFS_FS=m 409CONFIG_OMFS_FS=m
@@ -427,10 +473,18 @@ CONFIG_DLM=m
427CONFIG_MAGIC_SYSRQ=y 473CONFIG_MAGIC_SYSRQ=y
428CONFIG_ASYNC_RAID6_TEST=m 474CONFIG_ASYNC_RAID6_TEST=m
429CONFIG_TEST_STRING_HELPERS=m 475CONFIG_TEST_STRING_HELPERS=m
476CONFIG_TEST_KSTRTOX=m
477CONFIG_TEST_LKM=m
478CONFIG_TEST_USER_COPY=m
479CONFIG_TEST_BPF=m
480CONFIG_TEST_FIRMWARE=m
481CONFIG_TEST_UDELAY=m
482CONFIG_EARLY_PRINTK=y
430CONFIG_ENCRYPTED_KEYS=m 483CONFIG_ENCRYPTED_KEYS=m
431CONFIG_CRYPTO_MANAGER=y 484CONFIG_CRYPTO_MANAGER=y
432CONFIG_CRYPTO_USER=m 485CONFIG_CRYPTO_USER=m
433CONFIG_CRYPTO_CRYPTD=m 486CONFIG_CRYPTO_CRYPTD=m
487CONFIG_CRYPTO_MCRYPTD=m
434CONFIG_CRYPTO_TEST=m 488CONFIG_CRYPTO_TEST=m
435CONFIG_CRYPTO_CCM=m 489CONFIG_CRYPTO_CCM=m
436CONFIG_CRYPTO_GCM=m 490CONFIG_CRYPTO_GCM=m
@@ -465,13 +519,10 @@ CONFIG_CRYPTO_LZO=m
465CONFIG_CRYPTO_LZ4=m 519CONFIG_CRYPTO_LZ4=m
466CONFIG_CRYPTO_LZ4HC=m 520CONFIG_CRYPTO_LZ4HC=m
467# CONFIG_CRYPTO_ANSI_CPRNG is not set 521# CONFIG_CRYPTO_ANSI_CPRNG is not set
522CONFIG_CRYPTO_DRBG_MENU=m
523CONFIG_CRYPTO_DRBG_HASH=y
524CONFIG_CRYPTO_DRBG_CTR=y
468CONFIG_CRYPTO_USER_API_HASH=m 525CONFIG_CRYPTO_USER_API_HASH=m
469CONFIG_CRYPTO_USER_API_SKCIPHER=m 526CONFIG_CRYPTO_USER_API_SKCIPHER=m
470# CONFIG_CRYPTO_HW is not set 527# CONFIG_CRYPTO_HW is not set
471CONFIG_XZ_DEC_X86=y
472CONFIG_XZ_DEC_POWERPC=y
473CONFIG_XZ_DEC_IA64=y
474CONFIG_XZ_DEC_ARM=y
475CONFIG_XZ_DEC_ARMTHUMB=y
476CONFIG_XZ_DEC_SPARC=y
477CONFIG_XZ_DEC_TEST=m 528CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 9326ea664a5b..0d4a26f9b58c 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -32,6 +32,7 @@ CONFIG_VME=y
32CONFIG_MVME16x=y 32CONFIG_MVME16x=y
33# CONFIG_COMPACTION is not set 33# CONFIG_COMPACTION is not set
34CONFIG_CLEANCACHE=y 34CONFIG_CLEANCACHE=y
35CONFIG_ZPOOL=m
35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36CONFIG_BINFMT_AOUT=m 37CONFIG_BINFMT_AOUT=m
37CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
@@ -51,6 +52,8 @@ CONFIG_NET_IPIP=m
51CONFIG_NET_IPGRE_DEMUX=m 52CONFIG_NET_IPGRE_DEMUX=m
52CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
53CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m
54CONFIG_INET_AH=m 57CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -92,6 +95,8 @@ CONFIG_NFT_HASH=m
92CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
93CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
94CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
98CONFIG_NFT_MASQ=m
99CONFIG_NFT_REDIR=m
95CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
96CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
97CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
@@ -138,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
138CONFIG_NETFILTER_XT_MATCH_OSF=m 143CONFIG_NETFILTER_XT_MATCH_OSF=m
139CONFIG_NETFILTER_XT_MATCH_OWNER=m 144CONFIG_NETFILTER_XT_MATCH_OWNER=m
140CONFIG_NETFILTER_XT_MATCH_POLICY=m 145CONFIG_NETFILTER_XT_MATCH_POLICY=m
146CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
141CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 147CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
142CONFIG_NETFILTER_XT_MATCH_QUOTA=m 148CONFIG_NETFILTER_XT_MATCH_QUOTA=m
143CONFIG_NETFILTER_XT_MATCH_RATEEST=m 149CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -159,6 +165,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
159CONFIG_IP_SET_HASH_IPPORT=m 165CONFIG_IP_SET_HASH_IPPORT=m
160CONFIG_IP_SET_HASH_IPPORTIP=m 166CONFIG_IP_SET_HASH_IPPORTIP=m
161CONFIG_IP_SET_HASH_IPPORTNET=m 167CONFIG_IP_SET_HASH_IPPORTNET=m
168CONFIG_IP_SET_HASH_MAC=m
162CONFIG_IP_SET_HASH_NETPORTNET=m 169CONFIG_IP_SET_HASH_NETPORTNET=m
163CONFIG_IP_SET_HASH_NET=m 170CONFIG_IP_SET_HASH_NET=m
164CONFIG_IP_SET_HASH_NETNET=m 171CONFIG_IP_SET_HASH_NETNET=m
@@ -166,9 +173,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
166CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
167CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
168CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
169CONFIG_NFT_CHAIN_ROUTE_IPV4=m 177CONFIG_NFT_CHAIN_ROUTE_IPV4=m
170CONFIG_NFT_CHAIN_NAT_IPV4=m
171CONFIG_NF_TABLES_ARP=m 178CONFIG_NF_TABLES_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m
172CONFIG_IP_NF_IPTABLES=m 182CONFIG_IP_NF_IPTABLES=m
173CONFIG_IP_NF_MATCH_AH=m 183CONFIG_IP_NF_MATCH_AH=m
174CONFIG_IP_NF_MATCH_ECN=m 184CONFIG_IP_NF_MATCH_ECN=m
@@ -177,8 +187,7 @@ CONFIG_IP_NF_MATCH_TTL=m
177CONFIG_IP_NF_FILTER=m 187CONFIG_IP_NF_FILTER=m
178CONFIG_IP_NF_TARGET_REJECT=m 188CONFIG_IP_NF_TARGET_REJECT=m
179CONFIG_IP_NF_TARGET_SYNPROXY=m 189CONFIG_IP_NF_TARGET_SYNPROXY=m
180CONFIG_IP_NF_TARGET_ULOG=m 190CONFIG_IP_NF_NAT=m
181CONFIG_NF_NAT_IPV4=m
182CONFIG_IP_NF_TARGET_MASQUERADE=m 191CONFIG_IP_NF_TARGET_MASQUERADE=m
183CONFIG_IP_NF_TARGET_NETMAP=m 192CONFIG_IP_NF_TARGET_NETMAP=m
184CONFIG_IP_NF_TARGET_REDIRECT=m 193CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -193,6 +202,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
193CONFIG_NF_CONNTRACK_IPV6=m 202CONFIG_NF_CONNTRACK_IPV6=m
194CONFIG_NFT_CHAIN_ROUTE_IPV6=m 203CONFIG_NFT_CHAIN_ROUTE_IPV6=m
195CONFIG_NFT_CHAIN_NAT_IPV6=m 204CONFIG_NFT_CHAIN_NAT_IPV6=m
205CONFIG_NFT_MASQ_IPV6=m
206CONFIG_NFT_REDIR_IPV6=m
196CONFIG_IP6_NF_IPTABLES=m 207CONFIG_IP6_NF_IPTABLES=m
197CONFIG_IP6_NF_MATCH_AH=m 208CONFIG_IP6_NF_MATCH_AH=m
198CONFIG_IP6_NF_MATCH_EUI64=m 209CONFIG_IP6_NF_MATCH_EUI64=m
@@ -209,17 +220,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
209CONFIG_IP6_NF_TARGET_SYNPROXY=m 220CONFIG_IP6_NF_TARGET_SYNPROXY=m
210CONFIG_IP6_NF_MANGLE=m 221CONFIG_IP6_NF_MANGLE=m
211CONFIG_IP6_NF_RAW=m 222CONFIG_IP6_NF_RAW=m
212CONFIG_NF_NAT_IPV6=m 223CONFIG_IP6_NF_NAT=m
213CONFIG_IP6_NF_TARGET_MASQUERADE=m 224CONFIG_IP6_NF_TARGET_MASQUERADE=m
214CONFIG_IP6_NF_TARGET_NPT=m 225CONFIG_IP6_NF_TARGET_NPT=m
215CONFIG_NF_TABLES_BRIDGE=m 226CONFIG_NF_TABLES_BRIDGE=m
227CONFIG_NFT_BRIDGE_META=m
228CONFIG_NFT_BRIDGE_REJECT=m
229CONFIG_NF_LOG_BRIDGE=m
230CONFIG_BRIDGE_NF_EBTABLES=m
231CONFIG_BRIDGE_EBT_BROUTE=m
232CONFIG_BRIDGE_EBT_T_FILTER=m
233CONFIG_BRIDGE_EBT_T_NAT=m
234CONFIG_BRIDGE_EBT_802_3=m
235CONFIG_BRIDGE_EBT_AMONG=m
236CONFIG_BRIDGE_EBT_ARP=m
237CONFIG_BRIDGE_EBT_IP=m
238CONFIG_BRIDGE_EBT_IP6=m
239CONFIG_BRIDGE_EBT_LIMIT=m
240CONFIG_BRIDGE_EBT_MARK=m
241CONFIG_BRIDGE_EBT_PKTTYPE=m
242CONFIG_BRIDGE_EBT_STP=m
243CONFIG_BRIDGE_EBT_VLAN=m
244CONFIG_BRIDGE_EBT_ARPREPLY=m
245CONFIG_BRIDGE_EBT_DNAT=m
246CONFIG_BRIDGE_EBT_MARK_T=m
247CONFIG_BRIDGE_EBT_REDIRECT=m
248CONFIG_BRIDGE_EBT_SNAT=m
249CONFIG_BRIDGE_EBT_LOG=m
250CONFIG_BRIDGE_EBT_NFLOG=m
216CONFIG_IP_DCCP=m 251CONFIG_IP_DCCP=m
217# CONFIG_IP_DCCP_CCID3 is not set 252# CONFIG_IP_DCCP_CCID3 is not set
218CONFIG_SCTP_COOKIE_HMAC_SHA1=y 253CONFIG_SCTP_COOKIE_HMAC_SHA1=y
219CONFIG_RDS=m 254CONFIG_RDS=m
220CONFIG_RDS_TCP=m 255CONFIG_RDS_TCP=m
221CONFIG_L2TP=m 256CONFIG_L2TP=m
257CONFIG_BRIDGE=m
222CONFIG_ATALK=m 258CONFIG_ATALK=m
259CONFIG_6LOWPAN=m
223CONFIG_DNS_RESOLVER=y 260CONFIG_DNS_RESOLVER=y
224CONFIG_BATMAN_ADV=m 261CONFIG_BATMAN_ADV=m
225CONFIG_BATMAN_ADV_DAT=y 262CONFIG_BATMAN_ADV_DAT=y
@@ -228,9 +265,10 @@ CONFIG_BATMAN_ADV_MCAST=y
228CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
229CONFIG_NET_MPLS_GSO=m 266CONFIG_NET_MPLS_GSO=m
230# CONFIG_WIRELESS is not set 267# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set
231CONFIG_DEVTMPFS=y 269CONFIG_DEVTMPFS=y
270CONFIG_DEVTMPFS_MOUNT=y
232# CONFIG_FIRMWARE_IN_KERNEL is not set 271# CONFIG_FIRMWARE_IN_KERNEL is not set
233# CONFIG_FW_LOADER_USER_HELPER is not set
234CONFIG_CONNECTOR=m 272CONFIG_CONNECTOR=m
235CONFIG_BLK_DEV_LOOP=y 273CONFIG_BLK_DEV_LOOP=y
236CONFIG_BLK_DEV_CRYPTOLOOP=m 274CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -280,6 +318,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
280CONFIG_NET_TEAM_MODE_RANDOM=m 318CONFIG_NET_TEAM_MODE_RANDOM=m
281CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 319CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
282CONFIG_NET_TEAM_MODE_LOADBALANCE=m 320CONFIG_NET_TEAM_MODE_LOADBALANCE=m
321CONFIG_MACVLAN=m
322CONFIG_MACVTAP=m
323CONFIG_IPVLAN=m
283CONFIG_VXLAN=m 324CONFIG_VXLAN=m
284CONFIG_NETCONSOLE=m 325CONFIG_NETCONSOLE=m
285CONFIG_NETCONSOLE_DYNAMIC=y 326CONFIG_NETCONSOLE_DYNAMIC=y
@@ -290,6 +331,8 @@ CONFIG_MVME16x_NET=y
290# CONFIG_NET_VENDOR_MARVELL is not set 331# CONFIG_NET_VENDOR_MARVELL is not set
291# CONFIG_NET_VENDOR_MICREL is not set 332# CONFIG_NET_VENDOR_MICREL is not set
292# CONFIG_NET_VENDOR_NATSEMI is not set 333# CONFIG_NET_VENDOR_NATSEMI is not set
334# CONFIG_NET_VENDOR_QUALCOMM is not set
335# CONFIG_NET_VENDOR_ROCKER is not set
293# CONFIG_NET_VENDOR_SAMSUNG is not set 336# CONFIG_NET_VENDOR_SAMSUNG is not set
294# CONFIG_NET_VENDOR_SEEQ is not set 337# CONFIG_NET_VENDOR_SEEQ is not set
295# CONFIG_NET_VENDOR_STMICRO is not set 338# CONFIG_NET_VENDOR_STMICRO is not set
@@ -326,6 +369,7 @@ CONFIG_HID=m
326CONFIG_HIDRAW=y 369CONFIG_HIDRAW=y
327CONFIG_UHID=m 370CONFIG_UHID=m
328# CONFIG_HID_GENERIC is not set 371# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
329# CONFIG_USB_SUPPORT is not set 373# CONFIG_USB_SUPPORT is not set
330CONFIG_RTC_CLASS=y 374CONFIG_RTC_CLASS=y
331CONFIG_RTC_DRV_GENERIC=m 375CONFIG_RTC_DRV_GENERIC=m
@@ -343,6 +387,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
343CONFIG_AUTOFS4_FS=m 387CONFIG_AUTOFS4_FS=m
344CONFIG_FUSE_FS=m 388CONFIG_FUSE_FS=m
345CONFIG_CUSE=m 389CONFIG_CUSE=m
390CONFIG_OVERLAY_FS=m
346CONFIG_ISO9660_FS=y 391CONFIG_ISO9660_FS=y
347CONFIG_JOLIET=y 392CONFIG_JOLIET=y
348CONFIG_ZISOFS=y 393CONFIG_ZISOFS=y
@@ -358,6 +403,7 @@ CONFIG_HFS_FS=m
358CONFIG_HFSPLUS_FS=m 403CONFIG_HFSPLUS_FS=m
359CONFIG_CRAMFS=m 404CONFIG_CRAMFS=m
360CONFIG_SQUASHFS=m 405CONFIG_SQUASHFS=m
406CONFIG_SQUASHFS_LZ4=y
361CONFIG_SQUASHFS_LZO=y 407CONFIG_SQUASHFS_LZO=y
362CONFIG_MINIX_FS=m 408CONFIG_MINIX_FS=m
363CONFIG_OMFS_FS=m 409CONFIG_OMFS_FS=m
@@ -427,11 +473,18 @@ CONFIG_DLM=m
427CONFIG_MAGIC_SYSRQ=y 473CONFIG_MAGIC_SYSRQ=y
428CONFIG_ASYNC_RAID6_TEST=m 474CONFIG_ASYNC_RAID6_TEST=m
429CONFIG_TEST_STRING_HELPERS=m 475CONFIG_TEST_STRING_HELPERS=m
476CONFIG_TEST_KSTRTOX=m
477CONFIG_TEST_LKM=m
478CONFIG_TEST_USER_COPY=m
479CONFIG_TEST_BPF=m
480CONFIG_TEST_FIRMWARE=m
481CONFIG_TEST_UDELAY=m
430CONFIG_EARLY_PRINTK=y 482CONFIG_EARLY_PRINTK=y
431CONFIG_ENCRYPTED_KEYS=m 483CONFIG_ENCRYPTED_KEYS=m
432CONFIG_CRYPTO_MANAGER=y 484CONFIG_CRYPTO_MANAGER=y
433CONFIG_CRYPTO_USER=m 485CONFIG_CRYPTO_USER=m
434CONFIG_CRYPTO_CRYPTD=m 486CONFIG_CRYPTO_CRYPTD=m
487CONFIG_CRYPTO_MCRYPTD=m
435CONFIG_CRYPTO_TEST=m 488CONFIG_CRYPTO_TEST=m
436CONFIG_CRYPTO_CCM=m 489CONFIG_CRYPTO_CCM=m
437CONFIG_CRYPTO_GCM=m 490CONFIG_CRYPTO_GCM=m
@@ -466,13 +519,10 @@ CONFIG_CRYPTO_LZO=m
466CONFIG_CRYPTO_LZ4=m 519CONFIG_CRYPTO_LZ4=m
467CONFIG_CRYPTO_LZ4HC=m 520CONFIG_CRYPTO_LZ4HC=m
468# CONFIG_CRYPTO_ANSI_CPRNG is not set 521# CONFIG_CRYPTO_ANSI_CPRNG is not set
522CONFIG_CRYPTO_DRBG_MENU=m
523CONFIG_CRYPTO_DRBG_HASH=y
524CONFIG_CRYPTO_DRBG_CTR=y
469CONFIG_CRYPTO_USER_API_HASH=m 525CONFIG_CRYPTO_USER_API_HASH=m
470CONFIG_CRYPTO_USER_API_SKCIPHER=m 526CONFIG_CRYPTO_USER_API_SKCIPHER=m
471# CONFIG_CRYPTO_HW is not set 527# CONFIG_CRYPTO_HW is not set
472CONFIG_XZ_DEC_X86=y
473CONFIG_XZ_DEC_POWERPC=y
474CONFIG_XZ_DEC_IA64=y
475CONFIG_XZ_DEC_ARM=y
476CONFIG_XZ_DEC_ARMTHUMB=y
477CONFIG_XZ_DEC_SPARC=y
478CONFIG_XZ_DEC_TEST=m 528CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index d7d1101e31b5..5d581c503fa3 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -32,6 +32,7 @@ CONFIG_M68060=y
32CONFIG_Q40=y 32CONFIG_Q40=y
33# CONFIG_COMPACTION is not set 33# CONFIG_COMPACTION is not set
34CONFIG_CLEANCACHE=y 34CONFIG_CLEANCACHE=y
35CONFIG_ZPOOL=m
35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36CONFIG_BINFMT_AOUT=m 37CONFIG_BINFMT_AOUT=m
37CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
@@ -51,6 +52,8 @@ CONFIG_NET_IPIP=m
51CONFIG_NET_IPGRE_DEMUX=m 52CONFIG_NET_IPGRE_DEMUX=m
52CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
53CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m
54CONFIG_INET_AH=m 57CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -92,6 +95,8 @@ CONFIG_NFT_HASH=m
92CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
93CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
94CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
98CONFIG_NFT_MASQ=m
99CONFIG_NFT_REDIR=m
95CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
96CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
97CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
@@ -138,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
138CONFIG_NETFILTER_XT_MATCH_OSF=m 143CONFIG_NETFILTER_XT_MATCH_OSF=m
139CONFIG_NETFILTER_XT_MATCH_OWNER=m 144CONFIG_NETFILTER_XT_MATCH_OWNER=m
140CONFIG_NETFILTER_XT_MATCH_POLICY=m 145CONFIG_NETFILTER_XT_MATCH_POLICY=m
146CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
141CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 147CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
142CONFIG_NETFILTER_XT_MATCH_QUOTA=m 148CONFIG_NETFILTER_XT_MATCH_QUOTA=m
143CONFIG_NETFILTER_XT_MATCH_RATEEST=m 149CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -159,6 +165,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
159CONFIG_IP_SET_HASH_IPPORT=m 165CONFIG_IP_SET_HASH_IPPORT=m
160CONFIG_IP_SET_HASH_IPPORTIP=m 166CONFIG_IP_SET_HASH_IPPORTIP=m
161CONFIG_IP_SET_HASH_IPPORTNET=m 167CONFIG_IP_SET_HASH_IPPORTNET=m
168CONFIG_IP_SET_HASH_MAC=m
162CONFIG_IP_SET_HASH_NETPORTNET=m 169CONFIG_IP_SET_HASH_NETPORTNET=m
163CONFIG_IP_SET_HASH_NET=m 170CONFIG_IP_SET_HASH_NET=m
164CONFIG_IP_SET_HASH_NETNET=m 171CONFIG_IP_SET_HASH_NETNET=m
@@ -166,9 +173,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
166CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
167CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
168CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
169CONFIG_NFT_CHAIN_ROUTE_IPV4=m 177CONFIG_NFT_CHAIN_ROUTE_IPV4=m
170CONFIG_NFT_CHAIN_NAT_IPV4=m
171CONFIG_NF_TABLES_ARP=m 178CONFIG_NF_TABLES_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m
172CONFIG_IP_NF_IPTABLES=m 182CONFIG_IP_NF_IPTABLES=m
173CONFIG_IP_NF_MATCH_AH=m 183CONFIG_IP_NF_MATCH_AH=m
174CONFIG_IP_NF_MATCH_ECN=m 184CONFIG_IP_NF_MATCH_ECN=m
@@ -177,8 +187,7 @@ CONFIG_IP_NF_MATCH_TTL=m
177CONFIG_IP_NF_FILTER=m 187CONFIG_IP_NF_FILTER=m
178CONFIG_IP_NF_TARGET_REJECT=m 188CONFIG_IP_NF_TARGET_REJECT=m
179CONFIG_IP_NF_TARGET_SYNPROXY=m 189CONFIG_IP_NF_TARGET_SYNPROXY=m
180CONFIG_IP_NF_TARGET_ULOG=m 190CONFIG_IP_NF_NAT=m
181CONFIG_NF_NAT_IPV4=m
182CONFIG_IP_NF_TARGET_MASQUERADE=m 191CONFIG_IP_NF_TARGET_MASQUERADE=m
183CONFIG_IP_NF_TARGET_NETMAP=m 192CONFIG_IP_NF_TARGET_NETMAP=m
184CONFIG_IP_NF_TARGET_REDIRECT=m 193CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -193,6 +202,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
193CONFIG_NF_CONNTRACK_IPV6=m 202CONFIG_NF_CONNTRACK_IPV6=m
194CONFIG_NFT_CHAIN_ROUTE_IPV6=m 203CONFIG_NFT_CHAIN_ROUTE_IPV6=m
195CONFIG_NFT_CHAIN_NAT_IPV6=m 204CONFIG_NFT_CHAIN_NAT_IPV6=m
205CONFIG_NFT_MASQ_IPV6=m
206CONFIG_NFT_REDIR_IPV6=m
196CONFIG_IP6_NF_IPTABLES=m 207CONFIG_IP6_NF_IPTABLES=m
197CONFIG_IP6_NF_MATCH_AH=m 208CONFIG_IP6_NF_MATCH_AH=m
198CONFIG_IP6_NF_MATCH_EUI64=m 209CONFIG_IP6_NF_MATCH_EUI64=m
@@ -209,17 +220,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
209CONFIG_IP6_NF_TARGET_SYNPROXY=m 220CONFIG_IP6_NF_TARGET_SYNPROXY=m
210CONFIG_IP6_NF_MANGLE=m 221CONFIG_IP6_NF_MANGLE=m
211CONFIG_IP6_NF_RAW=m 222CONFIG_IP6_NF_RAW=m
212CONFIG_NF_NAT_IPV6=m 223CONFIG_IP6_NF_NAT=m
213CONFIG_IP6_NF_TARGET_MASQUERADE=m 224CONFIG_IP6_NF_TARGET_MASQUERADE=m
214CONFIG_IP6_NF_TARGET_NPT=m 225CONFIG_IP6_NF_TARGET_NPT=m
215CONFIG_NF_TABLES_BRIDGE=m 226CONFIG_NF_TABLES_BRIDGE=m
227CONFIG_NFT_BRIDGE_META=m
228CONFIG_NFT_BRIDGE_REJECT=m
229CONFIG_NF_LOG_BRIDGE=m
230CONFIG_BRIDGE_NF_EBTABLES=m
231CONFIG_BRIDGE_EBT_BROUTE=m
232CONFIG_BRIDGE_EBT_T_FILTER=m
233CONFIG_BRIDGE_EBT_T_NAT=m
234CONFIG_BRIDGE_EBT_802_3=m
235CONFIG_BRIDGE_EBT_AMONG=m
236CONFIG_BRIDGE_EBT_ARP=m
237CONFIG_BRIDGE_EBT_IP=m
238CONFIG_BRIDGE_EBT_IP6=m
239CONFIG_BRIDGE_EBT_LIMIT=m
240CONFIG_BRIDGE_EBT_MARK=m
241CONFIG_BRIDGE_EBT_PKTTYPE=m
242CONFIG_BRIDGE_EBT_STP=m
243CONFIG_BRIDGE_EBT_VLAN=m
244CONFIG_BRIDGE_EBT_ARPREPLY=m
245CONFIG_BRIDGE_EBT_DNAT=m
246CONFIG_BRIDGE_EBT_MARK_T=m
247CONFIG_BRIDGE_EBT_REDIRECT=m
248CONFIG_BRIDGE_EBT_SNAT=m
249CONFIG_BRIDGE_EBT_LOG=m
250CONFIG_BRIDGE_EBT_NFLOG=m
216CONFIG_IP_DCCP=m 251CONFIG_IP_DCCP=m
217# CONFIG_IP_DCCP_CCID3 is not set 252# CONFIG_IP_DCCP_CCID3 is not set
218CONFIG_SCTP_COOKIE_HMAC_SHA1=y 253CONFIG_SCTP_COOKIE_HMAC_SHA1=y
219CONFIG_RDS=m 254CONFIG_RDS=m
220CONFIG_RDS_TCP=m 255CONFIG_RDS_TCP=m
221CONFIG_L2TP=m 256CONFIG_L2TP=m
257CONFIG_BRIDGE=m
222CONFIG_ATALK=m 258CONFIG_ATALK=m
259CONFIG_6LOWPAN=m
223CONFIG_DNS_RESOLVER=y 260CONFIG_DNS_RESOLVER=y
224CONFIG_BATMAN_ADV=m 261CONFIG_BATMAN_ADV=m
225CONFIG_BATMAN_ADV_DAT=y 262CONFIG_BATMAN_ADV_DAT=y
@@ -228,9 +265,10 @@ CONFIG_BATMAN_ADV_MCAST=y
228CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
229CONFIG_NET_MPLS_GSO=m 266CONFIG_NET_MPLS_GSO=m
230# CONFIG_WIRELESS is not set 267# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set
231CONFIG_DEVTMPFS=y 269CONFIG_DEVTMPFS=y
270CONFIG_DEVTMPFS_MOUNT=y
232# CONFIG_FIRMWARE_IN_KERNEL is not set 271# CONFIG_FIRMWARE_IN_KERNEL is not set
233# CONFIG_FW_LOADER_USER_HELPER is not set
234CONFIG_CONNECTOR=m 272CONFIG_CONNECTOR=m
235CONFIG_PARPORT=m 273CONFIG_PARPORT=m
236CONFIG_PARPORT_PC=m 274CONFIG_PARPORT_PC=m
@@ -286,6 +324,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
286CONFIG_NET_TEAM_MODE_RANDOM=m 324CONFIG_NET_TEAM_MODE_RANDOM=m
287CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 325CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
288CONFIG_NET_TEAM_MODE_LOADBALANCE=m 326CONFIG_NET_TEAM_MODE_LOADBALANCE=m
327CONFIG_MACVLAN=m
328CONFIG_MACVTAP=m
329CONFIG_IPVLAN=m
289CONFIG_VXLAN=m 330CONFIG_VXLAN=m
290CONFIG_NETCONSOLE=m 331CONFIG_NETCONSOLE=m
291CONFIG_NETCONSOLE_DYNAMIC=y 332CONFIG_NETCONSOLE_DYNAMIC=y
@@ -300,6 +341,8 @@ CONFIG_VETH=m
300# CONFIG_NET_VENDOR_MARVELL is not set 341# CONFIG_NET_VENDOR_MARVELL is not set
301# CONFIG_NET_VENDOR_MICREL is not set 342# CONFIG_NET_VENDOR_MICREL is not set
302CONFIG_NE2000=m 343CONFIG_NE2000=m
344# CONFIG_NET_VENDOR_QUALCOMM is not set
345# CONFIG_NET_VENDOR_ROCKER is not set
303# CONFIG_NET_VENDOR_SAMSUNG is not set 346# CONFIG_NET_VENDOR_SAMSUNG is not set
304# CONFIG_NET_VENDOR_SEEQ is not set 347# CONFIG_NET_VENDOR_SEEQ is not set
305# CONFIG_NET_VENDOR_SMSC is not set 348# CONFIG_NET_VENDOR_SMSC is not set
@@ -347,6 +390,7 @@ CONFIG_HID=m
347CONFIG_HIDRAW=y 390CONFIG_HIDRAW=y
348CONFIG_UHID=m 391CONFIG_UHID=m
349# CONFIG_HID_GENERIC is not set 392# CONFIG_HID_GENERIC is not set
393# CONFIG_HID_PLANTRONICS is not set
350# CONFIG_USB_SUPPORT is not set 394# CONFIG_USB_SUPPORT is not set
351CONFIG_RTC_CLASS=y 395CONFIG_RTC_CLASS=y
352CONFIG_RTC_DRV_GENERIC=m 396CONFIG_RTC_DRV_GENERIC=m
@@ -365,6 +409,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
365CONFIG_AUTOFS4_FS=m 409CONFIG_AUTOFS4_FS=m
366CONFIG_FUSE_FS=m 410CONFIG_FUSE_FS=m
367CONFIG_CUSE=m 411CONFIG_CUSE=m
412CONFIG_OVERLAY_FS=m
368CONFIG_ISO9660_FS=y 413CONFIG_ISO9660_FS=y
369CONFIG_JOLIET=y 414CONFIG_JOLIET=y
370CONFIG_ZISOFS=y 415CONFIG_ZISOFS=y
@@ -380,6 +425,7 @@ CONFIG_HFS_FS=m
380CONFIG_HFSPLUS_FS=m 425CONFIG_HFSPLUS_FS=m
381CONFIG_CRAMFS=m 426CONFIG_CRAMFS=m
382CONFIG_SQUASHFS=m 427CONFIG_SQUASHFS=m
428CONFIG_SQUASHFS_LZ4=y
383CONFIG_SQUASHFS_LZO=y 429CONFIG_SQUASHFS_LZO=y
384CONFIG_MINIX_FS=m 430CONFIG_MINIX_FS=m
385CONFIG_OMFS_FS=m 431CONFIG_OMFS_FS=m
@@ -449,10 +495,18 @@ CONFIG_DLM=m
449CONFIG_MAGIC_SYSRQ=y 495CONFIG_MAGIC_SYSRQ=y
450CONFIG_ASYNC_RAID6_TEST=m 496CONFIG_ASYNC_RAID6_TEST=m
451CONFIG_TEST_STRING_HELPERS=m 497CONFIG_TEST_STRING_HELPERS=m
498CONFIG_TEST_KSTRTOX=m
499CONFIG_TEST_LKM=m
500CONFIG_TEST_USER_COPY=m
501CONFIG_TEST_BPF=m
502CONFIG_TEST_FIRMWARE=m
503CONFIG_TEST_UDELAY=m
504CONFIG_EARLY_PRINTK=y
452CONFIG_ENCRYPTED_KEYS=m 505CONFIG_ENCRYPTED_KEYS=m
453CONFIG_CRYPTO_MANAGER=y 506CONFIG_CRYPTO_MANAGER=y
454CONFIG_CRYPTO_USER=m 507CONFIG_CRYPTO_USER=m
455CONFIG_CRYPTO_CRYPTD=m 508CONFIG_CRYPTO_CRYPTD=m
509CONFIG_CRYPTO_MCRYPTD=m
456CONFIG_CRYPTO_TEST=m 510CONFIG_CRYPTO_TEST=m
457CONFIG_CRYPTO_CCM=m 511CONFIG_CRYPTO_CCM=m
458CONFIG_CRYPTO_GCM=m 512CONFIG_CRYPTO_GCM=m
@@ -487,13 +541,10 @@ CONFIG_CRYPTO_LZO=m
487CONFIG_CRYPTO_LZ4=m 541CONFIG_CRYPTO_LZ4=m
488CONFIG_CRYPTO_LZ4HC=m 542CONFIG_CRYPTO_LZ4HC=m
489# CONFIG_CRYPTO_ANSI_CPRNG is not set 543# CONFIG_CRYPTO_ANSI_CPRNG is not set
544CONFIG_CRYPTO_DRBG_MENU=m
545CONFIG_CRYPTO_DRBG_HASH=y
546CONFIG_CRYPTO_DRBG_CTR=y
490CONFIG_CRYPTO_USER_API_HASH=m 547CONFIG_CRYPTO_USER_API_HASH=m
491CONFIG_CRYPTO_USER_API_SKCIPHER=m 548CONFIG_CRYPTO_USER_API_SKCIPHER=m
492# CONFIG_CRYPTO_HW is not set 549# CONFIG_CRYPTO_HW is not set
493CONFIG_XZ_DEC_X86=y
494CONFIG_XZ_DEC_POWERPC=y
495CONFIG_XZ_DEC_IA64=y
496CONFIG_XZ_DEC_ARM=y
497CONFIG_XZ_DEC_ARMTHUMB=y
498CONFIG_XZ_DEC_SPARC=y
499CONFIG_XZ_DEC_TEST=m 550CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 98522e8fb852..c6b49a4a887c 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTINFO_PROC=y
29CONFIG_SUN3=y 29CONFIG_SUN3=y
30# CONFIG_COMPACTION is not set 30# CONFIG_COMPACTION is not set
31CONFIG_CLEANCACHE=y 31CONFIG_CLEANCACHE=y
32CONFIG_ZPOOL=m
32# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
33CONFIG_BINFMT_AOUT=m 34CONFIG_BINFMT_AOUT=m
34CONFIG_BINFMT_MISC=m 35CONFIG_BINFMT_MISC=m
@@ -48,6 +49,8 @@ CONFIG_NET_IPIP=m
48CONFIG_NET_IPGRE_DEMUX=m 49CONFIG_NET_IPGRE_DEMUX=m
49CONFIG_NET_IPGRE=m 50CONFIG_NET_IPGRE=m
50CONFIG_NET_IPVTI=m 51CONFIG_NET_IPVTI=m
52CONFIG_NET_FOU_IP_TUNNELS=y
53CONFIG_GENEVE=m
51CONFIG_INET_AH=m 54CONFIG_INET_AH=m
52CONFIG_INET_ESP=m 55CONFIG_INET_ESP=m
53CONFIG_INET_IPCOMP=m 56CONFIG_INET_IPCOMP=m
@@ -89,6 +92,8 @@ CONFIG_NFT_HASH=m
89CONFIG_NFT_COUNTER=m 92CONFIG_NFT_COUNTER=m
90CONFIG_NFT_LOG=m 93CONFIG_NFT_LOG=m
91CONFIG_NFT_LIMIT=m 94CONFIG_NFT_LIMIT=m
95CONFIG_NFT_MASQ=m
96CONFIG_NFT_REDIR=m
92CONFIG_NFT_NAT=m 97CONFIG_NFT_NAT=m
93CONFIG_NFT_QUEUE=m 98CONFIG_NFT_QUEUE=m
94CONFIG_NFT_REJECT=m 99CONFIG_NFT_REJECT=m
@@ -135,6 +140,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
135CONFIG_NETFILTER_XT_MATCH_OSF=m 140CONFIG_NETFILTER_XT_MATCH_OSF=m
136CONFIG_NETFILTER_XT_MATCH_OWNER=m 141CONFIG_NETFILTER_XT_MATCH_OWNER=m
137CONFIG_NETFILTER_XT_MATCH_POLICY=m 142CONFIG_NETFILTER_XT_MATCH_POLICY=m
143CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
138CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 144CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
139CONFIG_NETFILTER_XT_MATCH_QUOTA=m 145CONFIG_NETFILTER_XT_MATCH_QUOTA=m
140CONFIG_NETFILTER_XT_MATCH_RATEEST=m 146CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -156,6 +162,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
156CONFIG_IP_SET_HASH_IPPORT=m 162CONFIG_IP_SET_HASH_IPPORT=m
157CONFIG_IP_SET_HASH_IPPORTIP=m 163CONFIG_IP_SET_HASH_IPPORTIP=m
158CONFIG_IP_SET_HASH_IPPORTNET=m 164CONFIG_IP_SET_HASH_IPPORTNET=m
165CONFIG_IP_SET_HASH_MAC=m
159CONFIG_IP_SET_HASH_NETPORTNET=m 166CONFIG_IP_SET_HASH_NETPORTNET=m
160CONFIG_IP_SET_HASH_NET=m 167CONFIG_IP_SET_HASH_NET=m
161CONFIG_IP_SET_HASH_NETNET=m 168CONFIG_IP_SET_HASH_NETNET=m
@@ -163,9 +170,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
163CONFIG_IP_SET_HASH_NETIFACE=m 170CONFIG_IP_SET_HASH_NETIFACE=m
164CONFIG_IP_SET_LIST_SET=m 171CONFIG_IP_SET_LIST_SET=m
165CONFIG_NF_CONNTRACK_IPV4=m 172CONFIG_NF_CONNTRACK_IPV4=m
173CONFIG_NF_LOG_ARP=m
166CONFIG_NFT_CHAIN_ROUTE_IPV4=m 174CONFIG_NFT_CHAIN_ROUTE_IPV4=m
167CONFIG_NFT_CHAIN_NAT_IPV4=m
168CONFIG_NF_TABLES_ARP=m 175CONFIG_NF_TABLES_ARP=m
176CONFIG_NFT_CHAIN_NAT_IPV4=m
177CONFIG_NFT_MASQ_IPV4=m
178CONFIG_NFT_REDIR_IPV4=m
169CONFIG_IP_NF_IPTABLES=m 179CONFIG_IP_NF_IPTABLES=m
170CONFIG_IP_NF_MATCH_AH=m 180CONFIG_IP_NF_MATCH_AH=m
171CONFIG_IP_NF_MATCH_ECN=m 181CONFIG_IP_NF_MATCH_ECN=m
@@ -174,8 +184,7 @@ CONFIG_IP_NF_MATCH_TTL=m
174CONFIG_IP_NF_FILTER=m 184CONFIG_IP_NF_FILTER=m
175CONFIG_IP_NF_TARGET_REJECT=m 185CONFIG_IP_NF_TARGET_REJECT=m
176CONFIG_IP_NF_TARGET_SYNPROXY=m 186CONFIG_IP_NF_TARGET_SYNPROXY=m
177CONFIG_IP_NF_TARGET_ULOG=m 187CONFIG_IP_NF_NAT=m
178CONFIG_NF_NAT_IPV4=m
179CONFIG_IP_NF_TARGET_MASQUERADE=m 188CONFIG_IP_NF_TARGET_MASQUERADE=m
180CONFIG_IP_NF_TARGET_NETMAP=m 189CONFIG_IP_NF_TARGET_NETMAP=m
181CONFIG_IP_NF_TARGET_REDIRECT=m 190CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -190,6 +199,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
190CONFIG_NF_CONNTRACK_IPV6=m 199CONFIG_NF_CONNTRACK_IPV6=m
191CONFIG_NFT_CHAIN_ROUTE_IPV6=m 200CONFIG_NFT_CHAIN_ROUTE_IPV6=m
192CONFIG_NFT_CHAIN_NAT_IPV6=m 201CONFIG_NFT_CHAIN_NAT_IPV6=m
202CONFIG_NFT_MASQ_IPV6=m
203CONFIG_NFT_REDIR_IPV6=m
193CONFIG_IP6_NF_IPTABLES=m 204CONFIG_IP6_NF_IPTABLES=m
194CONFIG_IP6_NF_MATCH_AH=m 205CONFIG_IP6_NF_MATCH_AH=m
195CONFIG_IP6_NF_MATCH_EUI64=m 206CONFIG_IP6_NF_MATCH_EUI64=m
@@ -206,17 +217,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
206CONFIG_IP6_NF_TARGET_SYNPROXY=m 217CONFIG_IP6_NF_TARGET_SYNPROXY=m
207CONFIG_IP6_NF_MANGLE=m 218CONFIG_IP6_NF_MANGLE=m
208CONFIG_IP6_NF_RAW=m 219CONFIG_IP6_NF_RAW=m
209CONFIG_NF_NAT_IPV6=m 220CONFIG_IP6_NF_NAT=m
210CONFIG_IP6_NF_TARGET_MASQUERADE=m 221CONFIG_IP6_NF_TARGET_MASQUERADE=m
211CONFIG_IP6_NF_TARGET_NPT=m 222CONFIG_IP6_NF_TARGET_NPT=m
212CONFIG_NF_TABLES_BRIDGE=m 223CONFIG_NF_TABLES_BRIDGE=m
224CONFIG_NFT_BRIDGE_META=m
225CONFIG_NFT_BRIDGE_REJECT=m
226CONFIG_NF_LOG_BRIDGE=m
227CONFIG_BRIDGE_NF_EBTABLES=m
228CONFIG_BRIDGE_EBT_BROUTE=m
229CONFIG_BRIDGE_EBT_T_FILTER=m
230CONFIG_BRIDGE_EBT_T_NAT=m
231CONFIG_BRIDGE_EBT_802_3=m
232CONFIG_BRIDGE_EBT_AMONG=m
233CONFIG_BRIDGE_EBT_ARP=m
234CONFIG_BRIDGE_EBT_IP=m
235CONFIG_BRIDGE_EBT_IP6=m
236CONFIG_BRIDGE_EBT_LIMIT=m
237CONFIG_BRIDGE_EBT_MARK=m
238CONFIG_BRIDGE_EBT_PKTTYPE=m
239CONFIG_BRIDGE_EBT_STP=m
240CONFIG_BRIDGE_EBT_VLAN=m
241CONFIG_BRIDGE_EBT_ARPREPLY=m
242CONFIG_BRIDGE_EBT_DNAT=m
243CONFIG_BRIDGE_EBT_MARK_T=m
244CONFIG_BRIDGE_EBT_REDIRECT=m
245CONFIG_BRIDGE_EBT_SNAT=m
246CONFIG_BRIDGE_EBT_LOG=m
247CONFIG_BRIDGE_EBT_NFLOG=m
213CONFIG_IP_DCCP=m 248CONFIG_IP_DCCP=m
214# CONFIG_IP_DCCP_CCID3 is not set 249# CONFIG_IP_DCCP_CCID3 is not set
215CONFIG_SCTP_COOKIE_HMAC_SHA1=y 250CONFIG_SCTP_COOKIE_HMAC_SHA1=y
216CONFIG_RDS=m 251CONFIG_RDS=m
217CONFIG_RDS_TCP=m 252CONFIG_RDS_TCP=m
218CONFIG_L2TP=m 253CONFIG_L2TP=m
254CONFIG_BRIDGE=m
219CONFIG_ATALK=m 255CONFIG_ATALK=m
256CONFIG_6LOWPAN=m
220CONFIG_DNS_RESOLVER=y 257CONFIG_DNS_RESOLVER=y
221CONFIG_BATMAN_ADV=m 258CONFIG_BATMAN_ADV=m
222CONFIG_BATMAN_ADV_DAT=y 259CONFIG_BATMAN_ADV_DAT=y
@@ -225,9 +262,10 @@ CONFIG_BATMAN_ADV_MCAST=y
225CONFIG_NETLINK_DIAG=m 262CONFIG_NETLINK_DIAG=m
226CONFIG_NET_MPLS_GSO=m 263CONFIG_NET_MPLS_GSO=m
227# CONFIG_WIRELESS is not set 264# CONFIG_WIRELESS is not set
265# CONFIG_UEVENT_HELPER is not set
228CONFIG_DEVTMPFS=y 266CONFIG_DEVTMPFS=y
267CONFIG_DEVTMPFS_MOUNT=y
229# CONFIG_FIRMWARE_IN_KERNEL is not set 268# CONFIG_FIRMWARE_IN_KERNEL is not set
230# CONFIG_FW_LOADER_USER_HELPER is not set
231CONFIG_CONNECTOR=m 269CONFIG_CONNECTOR=m
232CONFIG_BLK_DEV_LOOP=y 270CONFIG_BLK_DEV_LOOP=y
233CONFIG_BLK_DEV_CRYPTOLOOP=m 271CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -277,6 +315,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
277CONFIG_NET_TEAM_MODE_RANDOM=m 315CONFIG_NET_TEAM_MODE_RANDOM=m
278CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 316CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
279CONFIG_NET_TEAM_MODE_LOADBALANCE=m 317CONFIG_NET_TEAM_MODE_LOADBALANCE=m
318CONFIG_MACVLAN=m
319CONFIG_MACVTAP=m
320CONFIG_IPVLAN=m
280CONFIG_VXLAN=m 321CONFIG_VXLAN=m
281CONFIG_NETCONSOLE=m 322CONFIG_NETCONSOLE=m
282CONFIG_NETCONSOLE_DYNAMIC=y 323CONFIG_NETCONSOLE_DYNAMIC=y
@@ -287,6 +328,8 @@ CONFIG_SUN3_82586=y
287# CONFIG_NET_VENDOR_MARVELL is not set 328# CONFIG_NET_VENDOR_MARVELL is not set
288# CONFIG_NET_VENDOR_MICREL is not set 329# CONFIG_NET_VENDOR_MICREL is not set
289# CONFIG_NET_VENDOR_NATSEMI is not set 330# CONFIG_NET_VENDOR_NATSEMI is not set
331# CONFIG_NET_VENDOR_QUALCOMM is not set
332# CONFIG_NET_VENDOR_ROCKER is not set
290# CONFIG_NET_VENDOR_SAMSUNG is not set 333# CONFIG_NET_VENDOR_SAMSUNG is not set
291# CONFIG_NET_VENDOR_SEEQ is not set 334# CONFIG_NET_VENDOR_SEEQ is not set
292# CONFIG_NET_VENDOR_STMICRO is not set 335# CONFIG_NET_VENDOR_STMICRO is not set
@@ -327,6 +370,7 @@ CONFIG_HID=m
327CONFIG_HIDRAW=y 370CONFIG_HIDRAW=y
328CONFIG_UHID=m 371CONFIG_UHID=m
329# CONFIG_HID_GENERIC is not set 372# CONFIG_HID_GENERIC is not set
373# CONFIG_HID_PLANTRONICS is not set
330# CONFIG_USB_SUPPORT is not set 374# CONFIG_USB_SUPPORT is not set
331CONFIG_RTC_CLASS=y 375CONFIG_RTC_CLASS=y
332CONFIG_RTC_DRV_GENERIC=m 376CONFIG_RTC_DRV_GENERIC=m
@@ -344,6 +388,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
344CONFIG_AUTOFS4_FS=m 388CONFIG_AUTOFS4_FS=m
345CONFIG_FUSE_FS=m 389CONFIG_FUSE_FS=m
346CONFIG_CUSE=m 390CONFIG_CUSE=m
391CONFIG_OVERLAY_FS=m
347CONFIG_ISO9660_FS=y 392CONFIG_ISO9660_FS=y
348CONFIG_JOLIET=y 393CONFIG_JOLIET=y
349CONFIG_ZISOFS=y 394CONFIG_ZISOFS=y
@@ -359,6 +404,7 @@ CONFIG_HFS_FS=m
359CONFIG_HFSPLUS_FS=m 404CONFIG_HFSPLUS_FS=m
360CONFIG_CRAMFS=m 405CONFIG_CRAMFS=m
361CONFIG_SQUASHFS=m 406CONFIG_SQUASHFS=m
407CONFIG_SQUASHFS_LZ4=y
362CONFIG_SQUASHFS_LZO=y 408CONFIG_SQUASHFS_LZO=y
363CONFIG_MINIX_FS=m 409CONFIG_MINIX_FS=m
364CONFIG_OMFS_FS=m 410CONFIG_OMFS_FS=m
@@ -428,10 +474,17 @@ CONFIG_DLM=m
428CONFIG_MAGIC_SYSRQ=y 474CONFIG_MAGIC_SYSRQ=y
429CONFIG_ASYNC_RAID6_TEST=m 475CONFIG_ASYNC_RAID6_TEST=m
430CONFIG_TEST_STRING_HELPERS=m 476CONFIG_TEST_STRING_HELPERS=m
477CONFIG_TEST_KSTRTOX=m
478CONFIG_TEST_LKM=m
479CONFIG_TEST_USER_COPY=m
480CONFIG_TEST_BPF=m
481CONFIG_TEST_FIRMWARE=m
482CONFIG_TEST_UDELAY=m
431CONFIG_ENCRYPTED_KEYS=m 483CONFIG_ENCRYPTED_KEYS=m
432CONFIG_CRYPTO_MANAGER=y 484CONFIG_CRYPTO_MANAGER=y
433CONFIG_CRYPTO_USER=m 485CONFIG_CRYPTO_USER=m
434CONFIG_CRYPTO_CRYPTD=m 486CONFIG_CRYPTO_CRYPTD=m
487CONFIG_CRYPTO_MCRYPTD=m
435CONFIG_CRYPTO_TEST=m 488CONFIG_CRYPTO_TEST=m
436CONFIG_CRYPTO_CCM=m 489CONFIG_CRYPTO_CCM=m
437CONFIG_CRYPTO_GCM=m 490CONFIG_CRYPTO_GCM=m
@@ -466,13 +519,10 @@ CONFIG_CRYPTO_LZO=m
466CONFIG_CRYPTO_LZ4=m 519CONFIG_CRYPTO_LZ4=m
467CONFIG_CRYPTO_LZ4HC=m 520CONFIG_CRYPTO_LZ4HC=m
468# CONFIG_CRYPTO_ANSI_CPRNG is not set 521# CONFIG_CRYPTO_ANSI_CPRNG is not set
522CONFIG_CRYPTO_DRBG_MENU=m
523CONFIG_CRYPTO_DRBG_HASH=y
524CONFIG_CRYPTO_DRBG_CTR=y
469CONFIG_CRYPTO_USER_API_HASH=m 525CONFIG_CRYPTO_USER_API_HASH=m
470CONFIG_CRYPTO_USER_API_SKCIPHER=m 526CONFIG_CRYPTO_USER_API_SKCIPHER=m
471# CONFIG_CRYPTO_HW is not set 527# CONFIG_CRYPTO_HW is not set
472CONFIG_XZ_DEC_X86=y
473CONFIG_XZ_DEC_POWERPC=y
474CONFIG_XZ_DEC_IA64=y
475CONFIG_XZ_DEC_ARM=y
476CONFIG_XZ_DEC_ARMTHUMB=y
477CONFIG_XZ_DEC_SPARC=y
478CONFIG_XZ_DEC_TEST=m 528CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 5128a8c3f4e3..b65785eaff8d 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTINFO_PROC=y
29CONFIG_SUN3X=y 29CONFIG_SUN3X=y
30# CONFIG_COMPACTION is not set 30# CONFIG_COMPACTION is not set
31CONFIG_CLEANCACHE=y 31CONFIG_CLEANCACHE=y
32CONFIG_ZPOOL=m
32# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
33CONFIG_BINFMT_AOUT=m 34CONFIG_BINFMT_AOUT=m
34CONFIG_BINFMT_MISC=m 35CONFIG_BINFMT_MISC=m
@@ -48,6 +49,8 @@ CONFIG_NET_IPIP=m
48CONFIG_NET_IPGRE_DEMUX=m 49CONFIG_NET_IPGRE_DEMUX=m
49CONFIG_NET_IPGRE=m 50CONFIG_NET_IPGRE=m
50CONFIG_NET_IPVTI=m 51CONFIG_NET_IPVTI=m
52CONFIG_NET_FOU_IP_TUNNELS=y
53CONFIG_GENEVE=m
51CONFIG_INET_AH=m 54CONFIG_INET_AH=m
52CONFIG_INET_ESP=m 55CONFIG_INET_ESP=m
53CONFIG_INET_IPCOMP=m 56CONFIG_INET_IPCOMP=m
@@ -89,6 +92,8 @@ CONFIG_NFT_HASH=m
89CONFIG_NFT_COUNTER=m 92CONFIG_NFT_COUNTER=m
90CONFIG_NFT_LOG=m 93CONFIG_NFT_LOG=m
91CONFIG_NFT_LIMIT=m 94CONFIG_NFT_LIMIT=m
95CONFIG_NFT_MASQ=m
96CONFIG_NFT_REDIR=m
92CONFIG_NFT_NAT=m 97CONFIG_NFT_NAT=m
93CONFIG_NFT_QUEUE=m 98CONFIG_NFT_QUEUE=m
94CONFIG_NFT_REJECT=m 99CONFIG_NFT_REJECT=m
@@ -135,6 +140,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
135CONFIG_NETFILTER_XT_MATCH_OSF=m 140CONFIG_NETFILTER_XT_MATCH_OSF=m
136CONFIG_NETFILTER_XT_MATCH_OWNER=m 141CONFIG_NETFILTER_XT_MATCH_OWNER=m
137CONFIG_NETFILTER_XT_MATCH_POLICY=m 142CONFIG_NETFILTER_XT_MATCH_POLICY=m
143CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
138CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 144CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
139CONFIG_NETFILTER_XT_MATCH_QUOTA=m 145CONFIG_NETFILTER_XT_MATCH_QUOTA=m
140CONFIG_NETFILTER_XT_MATCH_RATEEST=m 146CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -156,6 +162,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
156CONFIG_IP_SET_HASH_IPPORT=m 162CONFIG_IP_SET_HASH_IPPORT=m
157CONFIG_IP_SET_HASH_IPPORTIP=m 163CONFIG_IP_SET_HASH_IPPORTIP=m
158CONFIG_IP_SET_HASH_IPPORTNET=m 164CONFIG_IP_SET_HASH_IPPORTNET=m
165CONFIG_IP_SET_HASH_MAC=m
159CONFIG_IP_SET_HASH_NETPORTNET=m 166CONFIG_IP_SET_HASH_NETPORTNET=m
160CONFIG_IP_SET_HASH_NET=m 167CONFIG_IP_SET_HASH_NET=m
161CONFIG_IP_SET_HASH_NETNET=m 168CONFIG_IP_SET_HASH_NETNET=m
@@ -163,9 +170,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
163CONFIG_IP_SET_HASH_NETIFACE=m 170CONFIG_IP_SET_HASH_NETIFACE=m
164CONFIG_IP_SET_LIST_SET=m 171CONFIG_IP_SET_LIST_SET=m
165CONFIG_NF_CONNTRACK_IPV4=m 172CONFIG_NF_CONNTRACK_IPV4=m
173CONFIG_NF_LOG_ARP=m
166CONFIG_NFT_CHAIN_ROUTE_IPV4=m 174CONFIG_NFT_CHAIN_ROUTE_IPV4=m
167CONFIG_NFT_CHAIN_NAT_IPV4=m
168CONFIG_NF_TABLES_ARP=m 175CONFIG_NF_TABLES_ARP=m
176CONFIG_NFT_CHAIN_NAT_IPV4=m
177CONFIG_NFT_MASQ_IPV4=m
178CONFIG_NFT_REDIR_IPV4=m
169CONFIG_IP_NF_IPTABLES=m 179CONFIG_IP_NF_IPTABLES=m
170CONFIG_IP_NF_MATCH_AH=m 180CONFIG_IP_NF_MATCH_AH=m
171CONFIG_IP_NF_MATCH_ECN=m 181CONFIG_IP_NF_MATCH_ECN=m
@@ -174,8 +184,7 @@ CONFIG_IP_NF_MATCH_TTL=m
174CONFIG_IP_NF_FILTER=m 184CONFIG_IP_NF_FILTER=m
175CONFIG_IP_NF_TARGET_REJECT=m 185CONFIG_IP_NF_TARGET_REJECT=m
176CONFIG_IP_NF_TARGET_SYNPROXY=m 186CONFIG_IP_NF_TARGET_SYNPROXY=m
177CONFIG_IP_NF_TARGET_ULOG=m 187CONFIG_IP_NF_NAT=m
178CONFIG_NF_NAT_IPV4=m
179CONFIG_IP_NF_TARGET_MASQUERADE=m 188CONFIG_IP_NF_TARGET_MASQUERADE=m
180CONFIG_IP_NF_TARGET_NETMAP=m 189CONFIG_IP_NF_TARGET_NETMAP=m
181CONFIG_IP_NF_TARGET_REDIRECT=m 190CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -190,6 +199,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
190CONFIG_NF_CONNTRACK_IPV6=m 199CONFIG_NF_CONNTRACK_IPV6=m
191CONFIG_NFT_CHAIN_ROUTE_IPV6=m 200CONFIG_NFT_CHAIN_ROUTE_IPV6=m
192CONFIG_NFT_CHAIN_NAT_IPV6=m 201CONFIG_NFT_CHAIN_NAT_IPV6=m
202CONFIG_NFT_MASQ_IPV6=m
203CONFIG_NFT_REDIR_IPV6=m
193CONFIG_IP6_NF_IPTABLES=m 204CONFIG_IP6_NF_IPTABLES=m
194CONFIG_IP6_NF_MATCH_AH=m 205CONFIG_IP6_NF_MATCH_AH=m
195CONFIG_IP6_NF_MATCH_EUI64=m 206CONFIG_IP6_NF_MATCH_EUI64=m
@@ -206,17 +217,43 @@ CONFIG_IP6_NF_TARGET_REJECT=m
206CONFIG_IP6_NF_TARGET_SYNPROXY=m 217CONFIG_IP6_NF_TARGET_SYNPROXY=m
207CONFIG_IP6_NF_MANGLE=m 218CONFIG_IP6_NF_MANGLE=m
208CONFIG_IP6_NF_RAW=m 219CONFIG_IP6_NF_RAW=m
209CONFIG_NF_NAT_IPV6=m 220CONFIG_IP6_NF_NAT=m
210CONFIG_IP6_NF_TARGET_MASQUERADE=m 221CONFIG_IP6_NF_TARGET_MASQUERADE=m
211CONFIG_IP6_NF_TARGET_NPT=m 222CONFIG_IP6_NF_TARGET_NPT=m
212CONFIG_NF_TABLES_BRIDGE=m 223CONFIG_NF_TABLES_BRIDGE=m
224CONFIG_NFT_BRIDGE_META=m
225CONFIG_NFT_BRIDGE_REJECT=m
226CONFIG_NF_LOG_BRIDGE=m
227CONFIG_BRIDGE_NF_EBTABLES=m
228CONFIG_BRIDGE_EBT_BROUTE=m
229CONFIG_BRIDGE_EBT_T_FILTER=m
230CONFIG_BRIDGE_EBT_T_NAT=m
231CONFIG_BRIDGE_EBT_802_3=m
232CONFIG_BRIDGE_EBT_AMONG=m
233CONFIG_BRIDGE_EBT_ARP=m
234CONFIG_BRIDGE_EBT_IP=m
235CONFIG_BRIDGE_EBT_IP6=m
236CONFIG_BRIDGE_EBT_LIMIT=m
237CONFIG_BRIDGE_EBT_MARK=m
238CONFIG_BRIDGE_EBT_PKTTYPE=m
239CONFIG_BRIDGE_EBT_STP=m
240CONFIG_BRIDGE_EBT_VLAN=m
241CONFIG_BRIDGE_EBT_ARPREPLY=m
242CONFIG_BRIDGE_EBT_DNAT=m
243CONFIG_BRIDGE_EBT_MARK_T=m
244CONFIG_BRIDGE_EBT_REDIRECT=m
245CONFIG_BRIDGE_EBT_SNAT=m
246CONFIG_BRIDGE_EBT_LOG=m
247CONFIG_BRIDGE_EBT_NFLOG=m
213CONFIG_IP_DCCP=m 248CONFIG_IP_DCCP=m
214# CONFIG_IP_DCCP_CCID3 is not set 249# CONFIG_IP_DCCP_CCID3 is not set
215CONFIG_SCTP_COOKIE_HMAC_SHA1=y 250CONFIG_SCTP_COOKIE_HMAC_SHA1=y
216CONFIG_RDS=m 251CONFIG_RDS=m
217CONFIG_RDS_TCP=m 252CONFIG_RDS_TCP=m
218CONFIG_L2TP=m 253CONFIG_L2TP=m
254CONFIG_BRIDGE=m
219CONFIG_ATALK=m 255CONFIG_ATALK=m
256CONFIG_6LOWPAN=m
220CONFIG_DNS_RESOLVER=y 257CONFIG_DNS_RESOLVER=y
221CONFIG_BATMAN_ADV=m 258CONFIG_BATMAN_ADV=m
222CONFIG_BATMAN_ADV_DAT=y 259CONFIG_BATMAN_ADV_DAT=y
@@ -225,9 +262,10 @@ CONFIG_BATMAN_ADV_MCAST=y
225CONFIG_NETLINK_DIAG=m 262CONFIG_NETLINK_DIAG=m
226CONFIG_NET_MPLS_GSO=m 263CONFIG_NET_MPLS_GSO=m
227# CONFIG_WIRELESS is not set 264# CONFIG_WIRELESS is not set
265# CONFIG_UEVENT_HELPER is not set
228CONFIG_DEVTMPFS=y 266CONFIG_DEVTMPFS=y
267CONFIG_DEVTMPFS_MOUNT=y
229# CONFIG_FIRMWARE_IN_KERNEL is not set 268# CONFIG_FIRMWARE_IN_KERNEL is not set
230# CONFIG_FW_LOADER_USER_HELPER is not set
231CONFIG_CONNECTOR=m 269CONFIG_CONNECTOR=m
232CONFIG_BLK_DEV_LOOP=y 270CONFIG_BLK_DEV_LOOP=y
233CONFIG_BLK_DEV_CRYPTOLOOP=m 271CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -277,6 +315,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
277CONFIG_NET_TEAM_MODE_RANDOM=m 315CONFIG_NET_TEAM_MODE_RANDOM=m
278CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 316CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
279CONFIG_NET_TEAM_MODE_LOADBALANCE=m 317CONFIG_NET_TEAM_MODE_LOADBALANCE=m
318CONFIG_MACVLAN=m
319CONFIG_MACVTAP=m
320CONFIG_IPVLAN=m
280CONFIG_VXLAN=m 321CONFIG_VXLAN=m
281CONFIG_NETCONSOLE=m 322CONFIG_NETCONSOLE=m
282CONFIG_NETCONSOLE_DYNAMIC=y 323CONFIG_NETCONSOLE_DYNAMIC=y
@@ -288,6 +329,8 @@ CONFIG_SUN3LANCE=y
288# CONFIG_NET_VENDOR_MARVELL is not set 329# CONFIG_NET_VENDOR_MARVELL is not set
289# CONFIG_NET_VENDOR_MICREL is not set 330# CONFIG_NET_VENDOR_MICREL is not set
290# CONFIG_NET_VENDOR_NATSEMI is not set 331# CONFIG_NET_VENDOR_NATSEMI is not set
332# CONFIG_NET_VENDOR_QUALCOMM is not set
333# CONFIG_NET_VENDOR_ROCKER is not set
291# CONFIG_NET_VENDOR_SAMSUNG is not set 334# CONFIG_NET_VENDOR_SAMSUNG is not set
292# CONFIG_NET_VENDOR_SEEQ is not set 335# CONFIG_NET_VENDOR_SEEQ is not set
293# CONFIG_NET_VENDOR_STMICRO is not set 336# CONFIG_NET_VENDOR_STMICRO is not set
@@ -327,6 +370,7 @@ CONFIG_HID=m
327CONFIG_HIDRAW=y 370CONFIG_HIDRAW=y
328CONFIG_UHID=m 371CONFIG_UHID=m
329# CONFIG_HID_GENERIC is not set 372# CONFIG_HID_GENERIC is not set
373# CONFIG_HID_PLANTRONICS is not set
330# CONFIG_USB_SUPPORT is not set 374# CONFIG_USB_SUPPORT is not set
331CONFIG_RTC_CLASS=y 375CONFIG_RTC_CLASS=y
332CONFIG_RTC_DRV_GENERIC=m 376CONFIG_RTC_DRV_GENERIC=m
@@ -344,6 +388,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
344CONFIG_AUTOFS4_FS=m 388CONFIG_AUTOFS4_FS=m
345CONFIG_FUSE_FS=m 389CONFIG_FUSE_FS=m
346CONFIG_CUSE=m 390CONFIG_CUSE=m
391CONFIG_OVERLAY_FS=m
347CONFIG_ISO9660_FS=y 392CONFIG_ISO9660_FS=y
348CONFIG_JOLIET=y 393CONFIG_JOLIET=y
349CONFIG_ZISOFS=y 394CONFIG_ZISOFS=y
@@ -359,6 +404,7 @@ CONFIG_HFS_FS=m
359CONFIG_HFSPLUS_FS=m 404CONFIG_HFSPLUS_FS=m
360CONFIG_CRAMFS=m 405CONFIG_CRAMFS=m
361CONFIG_SQUASHFS=m 406CONFIG_SQUASHFS=m
407CONFIG_SQUASHFS_LZ4=y
362CONFIG_SQUASHFS_LZO=y 408CONFIG_SQUASHFS_LZO=y
363CONFIG_MINIX_FS=m 409CONFIG_MINIX_FS=m
364CONFIG_OMFS_FS=m 410CONFIG_OMFS_FS=m
@@ -428,10 +474,18 @@ CONFIG_DLM=m
428CONFIG_MAGIC_SYSRQ=y 474CONFIG_MAGIC_SYSRQ=y
429CONFIG_ASYNC_RAID6_TEST=m 475CONFIG_ASYNC_RAID6_TEST=m
430CONFIG_TEST_STRING_HELPERS=m 476CONFIG_TEST_STRING_HELPERS=m
477CONFIG_TEST_KSTRTOX=m
478CONFIG_TEST_LKM=m
479CONFIG_TEST_USER_COPY=m
480CONFIG_TEST_BPF=m
481CONFIG_TEST_FIRMWARE=m
482CONFIG_TEST_UDELAY=m
483CONFIG_EARLY_PRINTK=y
431CONFIG_ENCRYPTED_KEYS=m 484CONFIG_ENCRYPTED_KEYS=m
432CONFIG_CRYPTO_MANAGER=y 485CONFIG_CRYPTO_MANAGER=y
433CONFIG_CRYPTO_USER=m 486CONFIG_CRYPTO_USER=m
434CONFIG_CRYPTO_CRYPTD=m 487CONFIG_CRYPTO_CRYPTD=m
488CONFIG_CRYPTO_MCRYPTD=m
435CONFIG_CRYPTO_TEST=m 489CONFIG_CRYPTO_TEST=m
436CONFIG_CRYPTO_CCM=m 490CONFIG_CRYPTO_CCM=m
437CONFIG_CRYPTO_GCM=m 491CONFIG_CRYPTO_GCM=m
@@ -466,13 +520,10 @@ CONFIG_CRYPTO_LZO=m
466CONFIG_CRYPTO_LZ4=m 520CONFIG_CRYPTO_LZ4=m
467CONFIG_CRYPTO_LZ4HC=m 521CONFIG_CRYPTO_LZ4HC=m
468# CONFIG_CRYPTO_ANSI_CPRNG is not set 522# CONFIG_CRYPTO_ANSI_CPRNG is not set
523CONFIG_CRYPTO_DRBG_MENU=m
524CONFIG_CRYPTO_DRBG_HASH=y
525CONFIG_CRYPTO_DRBG_CTR=y
469CONFIG_CRYPTO_USER_API_HASH=m 526CONFIG_CRYPTO_USER_API_HASH=m
470CONFIG_CRYPTO_USER_API_SKCIPHER=m 527CONFIG_CRYPTO_USER_API_SKCIPHER=m
471# CONFIG_CRYPTO_HW is not set 528# CONFIG_CRYPTO_HW is not set
472CONFIG_XZ_DEC_X86=y
473CONFIG_XZ_DEC_POWERPC=y
474CONFIG_XZ_DEC_IA64=y
475CONFIG_XZ_DEC_ARM=y
476CONFIG_XZ_DEC_ARMTHUMB=y
477CONFIG_XZ_DEC_SPARC=y
478CONFIG_XZ_DEC_TEST=m 529CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 9b6c691874bd..1517ed1c6471 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -6,6 +6,7 @@ generic-y += device.h
6generic-y += emergency-restart.h 6generic-y += emergency-restart.h
7generic-y += errno.h 7generic-y += errno.h
8generic-y += exec.h 8generic-y += exec.h
9generic-y += futex.h
9generic-y += hw_irq.h 10generic-y += hw_irq.h
10generic-y += ioctl.h 11generic-y += ioctl.h
11generic-y += ipcbuf.h 12generic-y += ipcbuf.h
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index 953e0ac6855e..6321c4495620 100644
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -40,11 +40,6 @@
40/* convert irq_handler index to vector number */ 40/* convert irq_handler index to vector number */
41#define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) 41#define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8)))
42 42
43/* interrupt service types */
44#define IRQ_TYPE_SLOW 0
45#define IRQ_TYPE_FAST 1
46#define IRQ_TYPE_PRIO 2
47
48/* ST-MFP interrupts */ 43/* ST-MFP interrupts */
49#define IRQ_MFP_BUSY (8) 44#define IRQ_MFP_BUSY (8)
50#define IRQ_MFP_DCD (9) 45#define IRQ_MFP_DCD (9)
diff --git a/arch/m68k/include/asm/futex.h b/arch/m68k/include/asm/futex.h
deleted file mode 100644
index bc868af10c96..000000000000
--- a/arch/m68k/include/asm/futex.h
+++ /dev/null
@@ -1,94 +0,0 @@
1#ifndef _ASM_M68K_FUTEX_H
2#define _ASM_M68K_FUTEX_H
3
4#ifdef __KERNEL__
5#if !defined(CONFIG_MMU)
6#include <asm-generic/futex.h>
7#else /* CONFIG_MMU */
8
9#include <linux/futex.h>
10#include <linux/uaccess.h>
11#include <asm/errno.h>
12
13static inline int
14futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
15 u32 oldval, u32 newval)
16{
17 u32 val;
18
19 if (unlikely(get_user(val, uaddr) != 0))
20 return -EFAULT;
21
22 if (val == oldval && unlikely(put_user(newval, uaddr) != 0))
23 return -EFAULT;
24
25 *uval = val;
26
27 return 0;
28}
29
30static inline int
31futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
32{
33 int op = (encoded_op >> 28) & 7;
34 int cmp = (encoded_op >> 24) & 15;
35 int oparg = (encoded_op << 8) >> 20;
36 int cmparg = (encoded_op << 20) >> 20;
37 int oldval, ret;
38 u32 tmp;
39
40 if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
41 oparg = 1 << oparg;
42
43 pagefault_disable(); /* implies preempt_disable() */
44
45 ret = -EFAULT;
46 if (unlikely(get_user(oldval, uaddr) != 0))
47 goto out_pagefault_enable;
48
49 ret = 0;
50 tmp = oldval;
51
52 switch (op) {
53 case FUTEX_OP_SET:
54 tmp = oparg;
55 break;
56 case FUTEX_OP_ADD:
57 tmp += oparg;
58 break;
59 case FUTEX_OP_OR:
60 tmp |= oparg;
61 break;
62 case FUTEX_OP_ANDN:
63 tmp &= ~oparg;
64 break;
65 case FUTEX_OP_XOR:
66 tmp ^= oparg;
67 break;
68 default:
69 ret = -ENOSYS;
70 }
71
72 if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))
73 ret = -EFAULT;
74
75out_pagefault_enable:
76 pagefault_enable(); /* subsumes preempt_enable() */
77
78 if (ret == 0) {
79 switch (cmp) {
80 case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
81 case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
82 case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
83 case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
84 case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
85 case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
86 default: ret = -ENOSYS;
87 }
88 }
89 return ret;
90}
91
92#endif /* CONFIG_MMU */
93#endif /* __KERNEL__ */
94#endif /* _ASM_M68K_FUTEX_H */
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index 29c7c6c3a5f2..42235e7fbeed 100644
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -55,7 +55,7 @@ struct mac_model
55#define MAC_SCSI_QUADRA3 4 55#define MAC_SCSI_QUADRA3 4
56#define MAC_SCSI_IIFX 5 56#define MAC_SCSI_IIFX 5
57#define MAC_SCSI_DUO 6 57#define MAC_SCSI_DUO 6
58#define MAC_SCSI_CCL 7 58#define MAC_SCSI_LC 7
59#define MAC_SCSI_LATE 8 59#define MAC_SCSI_LATE 8
60 60
61#define MAC_IDE_NONE 0 61#define MAC_IDE_NONE 0
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index e9c3756139fc..689b47d292ac 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -296,7 +296,7 @@ static struct mac_model mac_data_table[] = {
296 .name = "IIvi", 296 .name = "IIvi",
297 .adb_type = MAC_ADB_IISI, 297 .adb_type = MAC_ADB_IISI,
298 .via_type = MAC_VIA_IICI, 298 .via_type = MAC_VIA_IICI,
299 .scsi_type = MAC_SCSI_OLD, 299 .scsi_type = MAC_SCSI_LC,
300 .scc_type = MAC_SCC_II, 300 .scc_type = MAC_SCC_II,
301 .nubus_type = MAC_NUBUS, 301 .nubus_type = MAC_NUBUS,
302 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 302 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -305,7 +305,7 @@ static struct mac_model mac_data_table[] = {
305 .name = "IIvx", 305 .name = "IIvx",
306 .adb_type = MAC_ADB_IISI, 306 .adb_type = MAC_ADB_IISI,
307 .via_type = MAC_VIA_IICI, 307 .via_type = MAC_VIA_IICI,
308 .scsi_type = MAC_SCSI_OLD, 308 .scsi_type = MAC_SCSI_LC,
309 .scc_type = MAC_SCC_II, 309 .scc_type = MAC_SCC_II,
310 .nubus_type = MAC_NUBUS, 310 .nubus_type = MAC_NUBUS,
311 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 311 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -320,7 +320,7 @@ static struct mac_model mac_data_table[] = {
320 .name = "Classic II", 320 .name = "Classic II",
321 .adb_type = MAC_ADB_IISI, 321 .adb_type = MAC_ADB_IISI,
322 .via_type = MAC_VIA_IICI, 322 .via_type = MAC_VIA_IICI,
323 .scsi_type = MAC_SCSI_OLD, 323 .scsi_type = MAC_SCSI_LC,
324 .scc_type = MAC_SCC_II, 324 .scc_type = MAC_SCC_II,
325 .nubus_type = MAC_NUBUS, 325 .nubus_type = MAC_NUBUS,
326 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 326 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -329,7 +329,7 @@ static struct mac_model mac_data_table[] = {
329 .name = "Color Classic", 329 .name = "Color Classic",
330 .adb_type = MAC_ADB_CUDA, 330 .adb_type = MAC_ADB_CUDA,
331 .via_type = MAC_VIA_IICI, 331 .via_type = MAC_VIA_IICI,
332 .scsi_type = MAC_SCSI_CCL, 332 .scsi_type = MAC_SCSI_LC,
333 .scc_type = MAC_SCC_II, 333 .scc_type = MAC_SCC_II,
334 .nubus_type = MAC_NUBUS, 334 .nubus_type = MAC_NUBUS,
335 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 335 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -338,7 +338,7 @@ static struct mac_model mac_data_table[] = {
338 .name = "Color Classic II", 338 .name = "Color Classic II",
339 .adb_type = MAC_ADB_CUDA, 339 .adb_type = MAC_ADB_CUDA,
340 .via_type = MAC_VIA_IICI, 340 .via_type = MAC_VIA_IICI,
341 .scsi_type = MAC_SCSI_CCL, 341 .scsi_type = MAC_SCSI_LC,
342 .scc_type = MAC_SCC_II, 342 .scc_type = MAC_SCC_II,
343 .nubus_type = MAC_NUBUS, 343 .nubus_type = MAC_NUBUS,
344 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 344 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -353,7 +353,7 @@ static struct mac_model mac_data_table[] = {
353 .name = "LC", 353 .name = "LC",
354 .adb_type = MAC_ADB_IISI, 354 .adb_type = MAC_ADB_IISI,
355 .via_type = MAC_VIA_IICI, 355 .via_type = MAC_VIA_IICI,
356 .scsi_type = MAC_SCSI_OLD, 356 .scsi_type = MAC_SCSI_LC,
357 .scc_type = MAC_SCC_II, 357 .scc_type = MAC_SCC_II,
358 .nubus_type = MAC_NUBUS, 358 .nubus_type = MAC_NUBUS,
359 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 359 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -362,7 +362,7 @@ static struct mac_model mac_data_table[] = {
362 .name = "LC II", 362 .name = "LC II",
363 .adb_type = MAC_ADB_IISI, 363 .adb_type = MAC_ADB_IISI,
364 .via_type = MAC_VIA_IICI, 364 .via_type = MAC_VIA_IICI,
365 .scsi_type = MAC_SCSI_OLD, 365 .scsi_type = MAC_SCSI_LC,
366 .scc_type = MAC_SCC_II, 366 .scc_type = MAC_SCC_II,
367 .nubus_type = MAC_NUBUS, 367 .nubus_type = MAC_NUBUS,
368 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 368 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -371,7 +371,7 @@ static struct mac_model mac_data_table[] = {
371 .name = "LC III", 371 .name = "LC III",
372 .adb_type = MAC_ADB_IISI, 372 .adb_type = MAC_ADB_IISI,
373 .via_type = MAC_VIA_IICI, 373 .via_type = MAC_VIA_IICI,
374 .scsi_type = MAC_SCSI_OLD, 374 .scsi_type = MAC_SCSI_LC,
375 .scc_type = MAC_SCC_II, 375 .scc_type = MAC_SCC_II,
376 .nubus_type = MAC_NUBUS, 376 .nubus_type = MAC_NUBUS,
377 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 377 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -499,7 +499,7 @@ static struct mac_model mac_data_table[] = {
499 .name = "Performa 460", 499 .name = "Performa 460",
500 .adb_type = MAC_ADB_IISI, 500 .adb_type = MAC_ADB_IISI,
501 .via_type = MAC_VIA_IICI, 501 .via_type = MAC_VIA_IICI,
502 .scsi_type = MAC_SCSI_OLD, 502 .scsi_type = MAC_SCSI_LC,
503 .scc_type = MAC_SCC_II, 503 .scc_type = MAC_SCC_II,
504 .nubus_type = MAC_NUBUS, 504 .nubus_type = MAC_NUBUS,
505 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 505 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -526,7 +526,7 @@ static struct mac_model mac_data_table[] = {
526 .name = "Performa 520", 526 .name = "Performa 520",
527 .adb_type = MAC_ADB_CUDA, 527 .adb_type = MAC_ADB_CUDA,
528 .via_type = MAC_VIA_IICI, 528 .via_type = MAC_VIA_IICI,
529 .scsi_type = MAC_SCSI_CCL, 529 .scsi_type = MAC_SCSI_LC,
530 .scc_type = MAC_SCC_II, 530 .scc_type = MAC_SCC_II,
531 .nubus_type = MAC_NUBUS, 531 .nubus_type = MAC_NUBUS,
532 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 532 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -535,7 +535,7 @@ static struct mac_model mac_data_table[] = {
535 .name = "Performa 550", 535 .name = "Performa 550",
536 .adb_type = MAC_ADB_CUDA, 536 .adb_type = MAC_ADB_CUDA,
537 .via_type = MAC_VIA_IICI, 537 .via_type = MAC_VIA_IICI,
538 .scsi_type = MAC_SCSI_CCL, 538 .scsi_type = MAC_SCSI_LC,
539 .scc_type = MAC_SCC_II, 539 .scc_type = MAC_SCC_II,
540 .nubus_type = MAC_NUBUS, 540 .nubus_type = MAC_NUBUS,
541 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 541 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -567,7 +567,7 @@ static struct mac_model mac_data_table[] = {
567 .name = "TV", 567 .name = "TV",
568 .adb_type = MAC_ADB_CUDA, 568 .adb_type = MAC_ADB_CUDA,
569 .via_type = MAC_VIA_IICI, 569 .via_type = MAC_VIA_IICI,
570 .scsi_type = MAC_SCSI_CCL, 570 .scsi_type = MAC_SCSI_LC,
571 .scc_type = MAC_SCC_II, 571 .scc_type = MAC_SCC_II,
572 .nubus_type = MAC_NUBUS, 572 .nubus_type = MAC_NUBUS,
573 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 573 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -576,7 +576,7 @@ static struct mac_model mac_data_table[] = {
576 .name = "Performa 600", 576 .name = "Performa 600",
577 .adb_type = MAC_ADB_IISI, 577 .adb_type = MAC_ADB_IISI,
578 .via_type = MAC_VIA_IICI, 578 .via_type = MAC_VIA_IICI,
579 .scsi_type = MAC_SCSI_OLD, 579 .scsi_type = MAC_SCSI_LC,
580 .scc_type = MAC_SCC_II, 580 .scc_type = MAC_SCC_II,
581 .nubus_type = MAC_NUBUS, 581 .nubus_type = MAC_NUBUS,
582 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 582 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -1109,8 +1109,10 @@ int __init mac_platform_init(void)
1109 platform_device_register_simple("mac_scsi", 0, 1109 platform_device_register_simple("mac_scsi", 0,
1110 mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc)); 1110 mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc));
1111 break; 1111 break;
1112 case MAC_SCSI_CCL: 1112 case MAC_SCSI_LC:
1113 /* Addresses from the Color Classic Developer Note. 1113 /* Addresses from Mac LC data in Designing Cards & Drivers 3ed.
1114 * Also from the Developer Notes for Classic II, LC III,
1115 * Color Classic and IIvx.
1114 * $50F0 6000 - $50F0 7FFF: SCSI handshake 1116 * $50F0 6000 - $50F0 7FFF: SCSI handshake
1115 * $50F1 0000 - $50F1 1FFF: SCSI 1117 * $50F1 0000 - $50F1 1FFF: SCSI
1116 * $50F1 2000 - $50F1 3FFF: SCSI DMA 1118 * $50F1 2000 - $50F1 3FFF: SCSI DMA
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 1bb3ce6634d3..e6a3b56c6481 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -168,49 +168,3 @@ int mvme147_set_clock_mmss (unsigned long nowtime)
168{ 168{
169 return 0; 169 return 0;
170} 170}
171
172/*------------------- Serial console stuff ------------------------*/
173
174static void scc_delay (void)
175{
176 int n;
177 volatile int trash;
178
179 for (n = 0; n < 20; n++)
180 trash = n;
181}
182
183static void scc_write (char ch)
184{
185 volatile char *p = (volatile char *)M147_SCC_A_ADDR;
186
187 do {
188 scc_delay();
189 }
190 while (!(*p & 4));
191 scc_delay();
192 *p = 8;
193 scc_delay();
194 *p = ch;
195}
196
197
198void m147_scc_write (struct console *co, const char *str, unsigned count)
199{
200 unsigned long flags;
201
202 local_irq_save(flags);
203
204 while (count--)
205 {
206 if (*str == '\n')
207 scc_write ('\r');
208 scc_write (*str++);
209 }
210 local_irq_restore(flags);
211}
212
213void mvme147_init_console_port (struct console *co, int cflag)
214{
215 co->write = m147_scc_write;
216}
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 6ef7a81a3b12..1755e2f7137d 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -161,4 +161,4 @@ static int __init rtc_MK48T08_init(void)
161 printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION); 161 printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
162 return misc_register(&rtc_dev); 162 return misc_register(&rtc_dev);
163} 163}
164module_init(rtc_MK48T08_init); 164device_initcall(rtc_MK48T08_init);
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index e07ce5ff2d48..b10964e8cb54 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -553,8 +553,8 @@ static unsigned long __init lance_probe1( struct net_device *dev,
553 if (lp->cardtype == PAM_CARD || 553 if (lp->cardtype == PAM_CARD ||
554 memaddr == (unsigned short *)0xffe00000) { 554 memaddr == (unsigned short *)0xffe00000) {
555 /* PAMs card and Riebl on ST use level 5 autovector */ 555 /* PAMs card and Riebl on ST use level 5 autovector */
556 if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, 556 if (request_irq(IRQ_AUTO_5, lance_interrupt, 0,
557 "PAM,Riebl-ST Ethernet", dev)) { 557 "PAM,Riebl-ST Ethernet", dev)) {
558 printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); 558 printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
559 return 0; 559 return 0;
560 } 560 }
@@ -567,8 +567,8 @@ static unsigned long __init lance_probe1( struct net_device *dev,
567 printk( "Lance: request for VME interrupt failed\n" ); 567 printk( "Lance: request for VME interrupt failed\n" );
568 return 0; 568 return 0;
569 } 569 }
570 if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO, 570 if (request_irq(irq, lance_interrupt, 0, "Riebl-VME Ethernet",
571 "Riebl-VME Ethernet", dev)) { 571 dev)) {
572 printk( "Lance: request for irq %u failed\n", irq ); 572 printk( "Lance: request for irq %u failed\n", irq );
573 return 0; 573 return 0;
574 } 574 }
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c
index 7ad59ac68cf6..a81cd2a2747f 100644
--- a/drivers/parport/parport_atari.c
+++ b/drivers/parport/parport_atari.c
@@ -192,8 +192,8 @@ static int __init parport_atari_init(void)
192 &parport_atari_ops); 192 &parport_atari_ops);
193 if (!p) 193 if (!p)
194 return -ENODEV; 194 return -ENODEV;
195 if (request_irq(IRQ_MFP_BUSY, parport_irq_handler, 195 if (request_irq(IRQ_MFP_BUSY, parport_irq_handler, 0, p->name,
196 IRQ_TYPE_SLOW, p->name, p)) { 196 p)) {
197 parport_put_port (p); 197 parport_put_port (p);
198 return -ENODEV; 198 return -ENODEV;
199 } 199 }
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c
index 4953b657635e..cb9ee2556850 100644
--- a/drivers/video/fbdev/atafb.c
+++ b/drivers/video/fbdev/atafb.c
@@ -3118,8 +3118,7 @@ int __init atafb_init(void)
3118 printk("atafb_init: initializing Falcon hw\n"); 3118 printk("atafb_init: initializing Falcon hw\n");
3119 fbhw = &falcon_switch; 3119 fbhw = &falcon_switch;
3120 atafb_ops.fb_setcolreg = &falcon_setcolreg; 3120 atafb_ops.fb_setcolreg = &falcon_setcolreg;
3121 error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, 3121 error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, 0,
3122 IRQ_TYPE_PRIO,
3123 "framebuffer:modeswitch", 3122 "framebuffer:modeswitch",
3124 falcon_vbl_switcher); 3123 falcon_vbl_switcher);
3125 if (error) 3124 if (error)
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index 13c214466d3b..1c56bf58eff9 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -851,7 +851,7 @@ static int __init AtaIrqInit(void)
851 st_mfp.tim_dt_a = 1; /* Cause interrupt after first event. */ 851 st_mfp.tim_dt_a = 1; /* Cause interrupt after first event. */
852 st_mfp.tim_ct_a = 8; /* Turn on event counting. */ 852 st_mfp.tim_ct_a = 8; /* Turn on event counting. */
853 /* Register interrupt handler. */ 853 /* Register interrupt handler. */
854 if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound", 854 if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, 0, "DMA sound",
855 AtaInterrupt)) 855 AtaInterrupt))
856 return 0; 856 return 0;
857 st_mfp.int_en_a |= 0x20; /* Turn interrupt on. */ 857 st_mfp.int_en_a |= 0x20; /* Turn interrupt on. */
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-30 01:17:40 -0500