Skip to content

Commit 7514712

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven: - build fix for drivers calling ndelay() in a conditional block without curly braces - defconfig updates * tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Fix ndelay() macro m68k/defconfig: Update defconfigs for v4.9-rc1
2 parents 1ca17e9 + 7e251bb commit 7514712

13 files changed

+73
-25
lines changed

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,21 @@ CONFIG_NF_TABLES_INET=m
9595
CONFIG_NF_TABLES_NETDEV=m
9696
CONFIG_NFT_EXTHDR=m
9797
CONFIG_NFT_META=m
98+
CONFIG_NFT_NUMGEN=m
9899
CONFIG_NFT_CT=m
99-
CONFIG_NFT_RBTREE=m
100-
CONFIG_NFT_HASH=m
100+
CONFIG_NFT_SET_RBTREE=m
101+
CONFIG_NFT_SET_HASH=m
101102
CONFIG_NFT_COUNTER=m
102103
CONFIG_NFT_LOG=m
103104
CONFIG_NFT_LIMIT=m
104105
CONFIG_NFT_MASQ=m
105106
CONFIG_NFT_REDIR=m
106107
CONFIG_NFT_NAT=m
107108
CONFIG_NFT_QUEUE=m
109+
CONFIG_NFT_QUOTA=m
108110
CONFIG_NFT_REJECT=m
109111
CONFIG_NFT_COMPAT=m
112+
CONFIG_NFT_HASH=m
110113
CONFIG_NFT_DUP_NETDEV=m
111114
CONFIG_NFT_FWD_NETDEV=m
112115
CONFIG_NETFILTER_XT_SET=m
@@ -366,6 +369,7 @@ CONFIG_NETCONSOLE=m
366369
CONFIG_NETCONSOLE_DYNAMIC=y
367370
CONFIG_VETH=m
368371
# CONFIG_NET_VENDOR_3COM is not set
372+
# CONFIG_NET_VENDOR_AMAZON is not set
369373
CONFIG_A2065=y
370374
CONFIG_ARIADNE=y
371375
# CONFIG_NET_VENDOR_ARC is not set

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,21 @@ CONFIG_NF_TABLES_INET=m
9393
CONFIG_NF_TABLES_NETDEV=m
9494
CONFIG_NFT_EXTHDR=m
9595
CONFIG_NFT_META=m
96+
CONFIG_NFT_NUMGEN=m
9697
CONFIG_NFT_CT=m
97-
CONFIG_NFT_RBTREE=m
98-
CONFIG_NFT_HASH=m
98+
CONFIG_NFT_SET_RBTREE=m
99+
CONFIG_NFT_SET_HASH=m
99100
CONFIG_NFT_COUNTER=m
100101
CONFIG_NFT_LOG=m
101102
CONFIG_NFT_LIMIT=m
102103
CONFIG_NFT_MASQ=m
103104
CONFIG_NFT_REDIR=m
104105
CONFIG_NFT_NAT=m
105106
CONFIG_NFT_QUEUE=m
107+
CONFIG_NFT_QUOTA=m
106108
CONFIG_NFT_REJECT=m
107109
CONFIG_NFT_COMPAT=m
110+
CONFIG_NFT_HASH=m
108111
CONFIG_NFT_DUP_NETDEV=m
109112
CONFIG_NFT_FWD_NETDEV=m
110113
CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
347350
CONFIG_NETCONSOLE=m
348351
CONFIG_NETCONSOLE_DYNAMIC=y
349352
CONFIG_VETH=m
353+
# CONFIG_NET_VENDOR_AMAZON is not set
350354
# CONFIG_NET_VENDOR_ARC is not set
351355
# CONFIG_NET_CADENCE is not set
352356
# CONFIG_NET_VENDOR_BROADCOM is not set

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,21 @@ CONFIG_NF_TABLES_INET=m
9393
CONFIG_NF_TABLES_NETDEV=m
9494
CONFIG_NFT_EXTHDR=m
9595
CONFIG_NFT_META=m
96+
CONFIG_NFT_NUMGEN=m
9697
CONFIG_NFT_CT=m
97-
CONFIG_NFT_RBTREE=m
98-
CONFIG_NFT_HASH=m
98+
CONFIG_NFT_SET_RBTREE=m
99+
CONFIG_NFT_SET_HASH=m
99100
CONFIG_NFT_COUNTER=m
100101
CONFIG_NFT_LOG=m
101102
CONFIG_NFT_LIMIT=m
102103
CONFIG_NFT_MASQ=m
103104
CONFIG_NFT_REDIR=m
104105
CONFIG_NFT_NAT=m
105106
CONFIG_NFT_QUEUE=m
107+
CONFIG_NFT_QUOTA=m
106108
CONFIG_NFT_REJECT=m
107109
CONFIG_NFT_COMPAT=m
110+
CONFIG_NFT_HASH=m
108111
CONFIG_NFT_DUP_NETDEV=m
109112
CONFIG_NFT_FWD_NETDEV=m
110113
CONFIG_NETFILTER_XT_SET=m
@@ -356,6 +359,7 @@ CONFIG_MACSEC=m
356359
CONFIG_NETCONSOLE=m
357360
CONFIG_NETCONSOLE_DYNAMIC=y
358361
CONFIG_VETH=m
362+
# CONFIG_NET_VENDOR_AMAZON is not set
359363
CONFIG_ATARILANCE=y
360364
# CONFIG_NET_VENDOR_ARC is not set
361365
# CONFIG_NET_CADENCE is not set

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,21 @@ CONFIG_NF_TABLES_INET=m
9191
CONFIG_NF_TABLES_NETDEV=m
9292
CONFIG_NFT_EXTHDR=m
9393
CONFIG_NFT_META=m
94+
CONFIG_NFT_NUMGEN=m
9495
CONFIG_NFT_CT=m
95-
CONFIG_NFT_RBTREE=m
96-
CONFIG_NFT_HASH=m
96+
CONFIG_NFT_SET_RBTREE=m
97+
CONFIG_NFT_SET_HASH=m
9798
CONFIG_NFT_COUNTER=m
9899
CONFIG_NFT_LOG=m
99100
CONFIG_NFT_LIMIT=m
100101
CONFIG_NFT_MASQ=m
101102
CONFIG_NFT_REDIR=m
102103
CONFIG_NFT_NAT=m
103104
CONFIG_NFT_QUEUE=m
105+
CONFIG_NFT_QUOTA=m
104106
CONFIG_NFT_REJECT=m
105107
CONFIG_NFT_COMPAT=m
108+
CONFIG_NFT_HASH=m
106109
CONFIG_NFT_DUP_NETDEV=m
107110
CONFIG_NFT_FWD_NETDEV=m
108111
CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
346349
CONFIG_NETCONSOLE=m
347350
CONFIG_NETCONSOLE_DYNAMIC=y
348351
CONFIG_VETH=m
352+
# CONFIG_NET_VENDOR_AMAZON is not set
349353
# CONFIG_NET_VENDOR_ARC is not set
350354
# CONFIG_NET_CADENCE is not set
351355
# CONFIG_NET_VENDOR_BROADCOM is not set

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,21 @@ CONFIG_NF_TABLES_INET=m
9393
CONFIG_NF_TABLES_NETDEV=m
9494
CONFIG_NFT_EXTHDR=m
9595
CONFIG_NFT_META=m
96+
CONFIG_NFT_NUMGEN=m
9697
CONFIG_NFT_CT=m
97-
CONFIG_NFT_RBTREE=m
98-
CONFIG_NFT_HASH=m
98+
CONFIG_NFT_SET_RBTREE=m
99+
CONFIG_NFT_SET_HASH=m
99100
CONFIG_NFT_COUNTER=m
100101
CONFIG_NFT_LOG=m
101102
CONFIG_NFT_LIMIT=m
102103
CONFIG_NFT_MASQ=m
103104
CONFIG_NFT_REDIR=m
104105
CONFIG_NFT_NAT=m
105106
CONFIG_NFT_QUEUE=m
107+
CONFIG_NFT_QUOTA=m
106108
CONFIG_NFT_REJECT=m
107109
CONFIG_NFT_COMPAT=m
110+
CONFIG_NFT_HASH=m
108111
CONFIG_NFT_DUP_NETDEV=m
109112
CONFIG_NFT_FWD_NETDEV=m
110113
CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
347350
CONFIG_NETCONSOLE=m
348351
CONFIG_NETCONSOLE_DYNAMIC=y
349352
CONFIG_VETH=m
353+
# CONFIG_NET_VENDOR_AMAZON is not set
350354
CONFIG_HPLANCE=y
351355
# CONFIG_NET_VENDOR_ARC is not set
352356
# CONFIG_NET_CADENCE is not set

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,21 @@ CONFIG_NF_TABLES_INET=m
9292
CONFIG_NF_TABLES_NETDEV=m
9393
CONFIG_NFT_EXTHDR=m
9494
CONFIG_NFT_META=m
95+
CONFIG_NFT_NUMGEN=m
9596
CONFIG_NFT_CT=m
96-
CONFIG_NFT_RBTREE=m
97-
CONFIG_NFT_HASH=m
97+
CONFIG_NFT_SET_RBTREE=m
98+
CONFIG_NFT_SET_HASH=m
9899
CONFIG_NFT_COUNTER=m
99100
CONFIG_NFT_LOG=m
100101
CONFIG_NFT_LIMIT=m
101102
CONFIG_NFT_MASQ=m
102103
CONFIG_NFT_REDIR=m
103104
CONFIG_NFT_NAT=m
104105
CONFIG_NFT_QUEUE=m
106+
CONFIG_NFT_QUOTA=m
105107
CONFIG_NFT_REJECT=m
106108
CONFIG_NFT_COMPAT=m
109+
CONFIG_NFT_HASH=m
107110
CONFIG_NFT_DUP_NETDEV=m
108111
CONFIG_NFT_FWD_NETDEV=m
109112
CONFIG_NETFILTER_XT_SET=m
@@ -363,6 +366,7 @@ CONFIG_MACSEC=m
363366
CONFIG_NETCONSOLE=m
364367
CONFIG_NETCONSOLE_DYNAMIC=y
365368
CONFIG_VETH=m
369+
# CONFIG_NET_VENDOR_AMAZON is not set
366370
CONFIG_MACMACE=y
367371
# CONFIG_NET_VENDOR_ARC is not set
368372
# CONFIG_NET_CADENCE is not set

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,21 @@ CONFIG_NF_TABLES_INET=m
102102
CONFIG_NF_TABLES_NETDEV=m
103103
CONFIG_NFT_EXTHDR=m
104104
CONFIG_NFT_META=m
105+
CONFIG_NFT_NUMGEN=m
105106
CONFIG_NFT_CT=m
106-
CONFIG_NFT_RBTREE=m
107-
CONFIG_NFT_HASH=m
107+
CONFIG_NFT_SET_RBTREE=m
108+
CONFIG_NFT_SET_HASH=m
108109
CONFIG_NFT_COUNTER=m
109110
CONFIG_NFT_LOG=m
110111
CONFIG_NFT_LIMIT=m
111112
CONFIG_NFT_MASQ=m
112113
CONFIG_NFT_REDIR=m
113114
CONFIG_NFT_NAT=m
114115
CONFIG_NFT_QUEUE=m
116+
CONFIG_NFT_QUOTA=m
115117
CONFIG_NFT_REJECT=m
116118
CONFIG_NFT_COMPAT=m
119+
CONFIG_NFT_HASH=m
117120
CONFIG_NFT_DUP_NETDEV=m
118121
CONFIG_NFT_FWD_NETDEV=m
119122
CONFIG_NETFILTER_XT_SET=m
@@ -397,6 +400,7 @@ CONFIG_NETCONSOLE=m
397400
CONFIG_NETCONSOLE_DYNAMIC=y
398401
CONFIG_VETH=m
399402
# CONFIG_NET_VENDOR_3COM is not set
403+
# CONFIG_NET_VENDOR_AMAZON is not set
400404
CONFIG_A2065=y
401405
CONFIG_ARIADNE=y
402406
CONFIG_ATARILANCE=y

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,21 @@ CONFIG_NF_TABLES_INET=m
9090
CONFIG_NF_TABLES_NETDEV=m
9191
CONFIG_NFT_EXTHDR=m
9292
CONFIG_NFT_META=m
93+
CONFIG_NFT_NUMGEN=m
9394
CONFIG_NFT_CT=m
94-
CONFIG_NFT_RBTREE=m
95-
CONFIG_NFT_HASH=m
95+
CONFIG_NFT_SET_RBTREE=m
96+
CONFIG_NFT_SET_HASH=m
9697
CONFIG_NFT_COUNTER=m
9798
CONFIG_NFT_LOG=m
9899
CONFIG_NFT_LIMIT=m
99100
CONFIG_NFT_MASQ=m
100101
CONFIG_NFT_REDIR=m
101102
CONFIG_NFT_NAT=m
102103
CONFIG_NFT_QUEUE=m
104+
CONFIG_NFT_QUOTA=m
103105
CONFIG_NFT_REJECT=m
104106
CONFIG_NFT_COMPAT=m
107+
CONFIG_NFT_HASH=m
105108
CONFIG_NFT_DUP_NETDEV=m
106109
CONFIG_NFT_FWD_NETDEV=m
107110
CONFIG_NETFILTER_XT_SET=m
@@ -345,6 +348,7 @@ CONFIG_MACSEC=m
345348
CONFIG_NETCONSOLE=m
346349
CONFIG_NETCONSOLE_DYNAMIC=y
347350
CONFIG_VETH=m
351+
# CONFIG_NET_VENDOR_AMAZON is not set
348352
CONFIG_MVME147_NET=y
349353
# CONFIG_NET_VENDOR_ARC is not set
350354
# CONFIG_NET_CADENCE is not set

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,21 @@ CONFIG_NF_TABLES_INET=m
9191
CONFIG_NF_TABLES_NETDEV=m
9292
CONFIG_NFT_EXTHDR=m
9393
CONFIG_NFT_META=m
94+
CONFIG_NFT_NUMGEN=m
9495
CONFIG_NFT_CT=m
95-
CONFIG_NFT_RBTREE=m
96-
CONFIG_NFT_HASH=m
96+
CONFIG_NFT_SET_RBTREE=m
97+
CONFIG_NFT_SET_HASH=m
9798
CONFIG_NFT_COUNTER=m
9899
CONFIG_NFT_LOG=m
99100
CONFIG_NFT_LIMIT=m
100101
CONFIG_NFT_MASQ=m
101102
CONFIG_NFT_REDIR=m
102103
CONFIG_NFT_NAT=m
103104
CONFIG_NFT_QUEUE=m
105+
CONFIG_NFT_QUOTA=m
104106
CONFIG_NFT_REJECT=m
105107
CONFIG_NFT_COMPAT=m
108+
CONFIG_NFT_HASH=m
106109
CONFIG_NFT_DUP_NETDEV=m
107110
CONFIG_NFT_FWD_NETDEV=m
108111
CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
346349
CONFIG_NETCONSOLE=m
347350
CONFIG_NETCONSOLE_DYNAMIC=y
348351
CONFIG_VETH=m
352+
# CONFIG_NET_VENDOR_AMAZON is not set
349353
# CONFIG_NET_VENDOR_ARC is not set
350354
# CONFIG_NET_CADENCE is not set
351355
# CONFIG_NET_VENDOR_BROADCOM is not set

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,21 @@ CONFIG_NF_TABLES_INET=m
9191
CONFIG_NF_TABLES_NETDEV=m
9292
CONFIG_NFT_EXTHDR=m
9393
CONFIG_NFT_META=m
94+
CONFIG_NFT_NUMGEN=m
9495
CONFIG_NFT_CT=m
95-
CONFIG_NFT_RBTREE=m
96-
CONFIG_NFT_HASH=m
96+
CONFIG_NFT_SET_RBTREE=m
97+
CONFIG_NFT_SET_HASH=m
9798
CONFIG_NFT_COUNTER=m
9899
CONFIG_NFT_LOG=m
99100
CONFIG_NFT_LIMIT=m
100101
CONFIG_NFT_MASQ=m
101102
CONFIG_NFT_REDIR=m
102103
CONFIG_NFT_NAT=m
103104
CONFIG_NFT_QUEUE=m
105+
CONFIG_NFT_QUOTA=m
104106
CONFIG_NFT_REJECT=m
105107
CONFIG_NFT_COMPAT=m
108+
CONFIG_NFT_HASH=m
106109
CONFIG_NFT_DUP_NETDEV=m
107110
CONFIG_NFT_FWD_NETDEV=m
108111
CONFIG_NETFILTER_XT_SET=m
@@ -353,6 +356,7 @@ CONFIG_NETCONSOLE=m
353356
CONFIG_NETCONSOLE_DYNAMIC=y
354357
CONFIG_VETH=m
355358
# CONFIG_NET_VENDOR_3COM is not set
359+
# CONFIG_NET_VENDOR_AMAZON is not set
356360
# CONFIG_NET_VENDOR_AMD is not set
357361
# CONFIG_NET_VENDOR_ARC is not set
358362
# CONFIG_NET_CADENCE is not set

0 commit comments

Comments
 (0)