Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75147120 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1ca17e97 7e251bb2

arch/m68k/configs/amiga_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -95,9 +95,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_LIMIT=m
@@ -105,8 +106,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m
@@ -366,6 +369,7 @@ CONFIG_NETCONSOLE=m 
CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_AMAZON is not set

CONFIG_A2065=y

CONFIG_A2065=y

CONFIG_ARIADNE=y

CONFIG_ARIADNE=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ARC is not set

arch/m68k/configs/apollo_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m 
CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

arch/m68k/configs/atari_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m
@@ -356,6 +359,7 @@ CONFIG_MACSEC=m 
CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_AMAZON is not set

CONFIG_ATARILANCE=y

CONFIG_ATARILANCE=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_CADENCE is not set

arch/m68k/configs/bvme6000_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m 
CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

arch/m68k/configs/hp300_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m 
CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_AMAZON is not set

CONFIG_HPLANCE=y

CONFIG_HPLANCE=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_CADENCE is not set