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

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

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

Pull m68k updates from Geert Uytterhoeven:

  - first part of an overhaul of the NuBus subsystem, to bring it up to
    modern driver model standards

  - a race condition fix for Mac

  - defconfig updates

* tag 'm68k-for-v4.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  MAINTAINERS: Add NuBus subsystem entry
  m68k/mac: Fix race conditions in OSS interrupt dispatch
  nubus: Add support for the driver model
  nubus: Add expansion_type values for various Mac models
  nubus: Adopt standard linked list implementation
  nubus: Rename struct nubus_dev
  nubus: Rework /proc/bus/nubus/s/ implementation
  nubus: Generalize block resource handling
  nubus: Clean up whitespace
  nubus: Remove redundant code
  nubus: Call proc_mkdir() not more than once per slot directory
  nubus: Validate slot resource IDs
  nubus: Fix log spam
  nubus: Use static functions where possible
  nubus: Fix up header split
  nubus: Avoid array underflow and overflow
  m68k/defconfig: Update defconfigs for v4.15-rc1
parents 31466f3e 2334b1ac

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -9757,6 +9757,15 @@ S: Supported 
F:	Documentation/filesystems/ntfs.txt

F:	fs/ntfs/



NUBUS SUBSYSTEM

M:	Finn Thain <fthain@telegraphics.com.au>

L:	linux-m68k@lists.linux-m68k.org

S:	Maintained

F:	arch/*/include/asm/nubus.h

F:	drivers/nubus/

F:	include/linux/nubus.h

F:	include/uapi/linux/nubus.h



NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER

M:	Antonino Daplas <adaplas@gmail.com>

L:	linux-fbdev@vger.kernel.org

arch/m68k/configs/amiga_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -454,7 +454,6 @@ 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
@@ -595,6 +594,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m
@@ -624,6 +624,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -653,3 +654,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

arch/m68k/configs/apollo_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ 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
@@ -554,6 +553,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m
@@ -583,6 +583,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -612,3 +613,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

arch/m68k/configs/atari_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ 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
@@ -576,6 +575,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m
@@ -605,6 +605,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -634,3 +635,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m

arch/m68k/configs/bvme6000_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ 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
@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m
@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_XZ_DEC_TEST=m

CONFIG_STRING_SELFTEST=m