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

Commit 9e09d05c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - more printk modernization

  - various cleanups and fixes (incl. a race condition) for Mac

  - defconfig updates

* tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.14-rc7
  m68k/mac: Add mutual exclusion for IOP interrupt polling
  m68k/mac: Disentangle VIA/RBV and NuBus initialization
  m68k/mac: Disentangle VIA and OSS initialization
  m68k/mac: More printk modernization
parents d60a540a 5e387199

arch/m68k/configs/amiga_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ CONFIG_NFT_HASH=m 
CONFIG_NFT_FIB_INET=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -302,6 +303,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set
@@ -400,6 +402,7 @@ CONFIG_ARIADNE=y 
# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -451,6 +454,7 @@ CONFIG_PPS_CLIENT_LDISC=m 
CONFIG_PPS_CLIENT_PARPORT=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_RC_CORE is not set

CONFIG_FB=y

CONFIG_FB_CIRRUS=y

CONFIG_FB_AMIGA=y
@@ -607,12 +611,10 @@ CONFIG_CRYPTO_USER=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/apollo_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m 
CONFIG_NFT_FIB_INET=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set
@@ -377,6 +379,7 @@ CONFIG_VETH=m 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -419,6 +422,7 @@ CONFIG_NTP_PPS=y 
CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_RC_CORE is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y
@@ -566,12 +570,10 @@ CONFIG_CRYPTO_USER=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/atari_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m 
CONFIG_NFT_FIB_INET=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set
@@ -387,6 +389,7 @@ CONFIG_ATARILANCE=y 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -434,6 +437,7 @@ CONFIG_PPS_CLIENT_LDISC=m 
CONFIG_PPS_CLIENT_PARPORT=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_RC_CORE is not set

CONFIG_FB=y

CONFIG_FB_ATARI=y

CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -588,12 +592,10 @@ CONFIG_CRYPTO_USER=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/bvme6000_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ CONFIG_NFT_HASH=m 
CONFIG_NFT_FIB_INET=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -298,6 +299,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set
@@ -376,6 +378,7 @@ CONFIG_VETH=m 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

CONFIG_BVME6000_NET=y

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -417,6 +420,7 @@ CONFIG_NTP_PPS=y 
CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_RC_CORE is not set

CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_UHID=m
@@ -558,12 +562,10 @@ CONFIG_CRYPTO_USER=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/hp300_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m 
CONFIG_NFT_FIB_INET=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set
@@ -378,6 +380,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -422,6 +425,7 @@ CONFIG_NTP_PPS=y 
CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_RC_CORE is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y
@@ -568,12 +572,10 @@ CONFIG_CRYPTO_USER=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m