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

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

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

Pull m68k updates from Geert Uytterhoeven:

  - restore symbol versions for symbols exported from assembly

  - defconfig updates

  - Mac fixes

* tag 'm68k-for-v4.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/mac: Avoid soft-lockup warning after mach_power_off
  m68k/mac: Don't hang waiting for Cuda power-down command
  m68k: Restore symbol versions for symbols exported from assembly
  m68k/defconfig: Update defconfigs for v4.13-rc1
parents 24e700e2 558d5ad2

arch/m68k/configs/amiga_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ CONFIG_PACKET=y 
CONFIG_PACKET_DIAG=m

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=m

CONFIG_TLS=m

CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -465,8 +466,10 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_ITE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_MSM6242=m

CONFIG_RTC_DRV_RP5C01=m

# CONFIG_IOMMU_SUPPORT is not set
@@ -477,7 +480,6 @@ CONFIG_SERIAL_CONSOLE=y 
CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m
@@ -587,12 +589,13 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

arch/m68k/configs/apollo_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_PACKET=y 
CONFIG_PACKET_DIAG=m

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=m

CONFIG_TLS=m

CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -427,8 +428,10 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_ITE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_HEARTBEAT=y
@@ -436,7 +439,6 @@ CONFIG_PROC_HARDWARE=y 
CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m
@@ -546,12 +548,13 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

arch/m68k/configs/atari_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_PACKET=y 
CONFIG_PACKET_DIAG=m

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=m

CONFIG_TLS=m

CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -442,7 +443,10 @@ CONFIG_DMASOUND_ATARI=m 
CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_ITE is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_HEARTBEAT=y
@@ -457,7 +461,6 @@ CONFIG_ATARI_DSP56K=m 
CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m
@@ -567,12 +570,13 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

arch/m68k/configs/bvme6000_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ CONFIG_PACKET=y 
CONFIG_PACKET_DIAG=m

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=m

CONFIG_TLS=m

CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -420,15 +421,16 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_ITE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m
@@ -538,12 +540,13 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

arch/m68k/configs/hp300_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_PACKET=y 
CONFIG_PACKET_DIAG=m

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=m

CONFIG_TLS=m

CONFIG_XFRM_MIGRATE=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -430,15 +431,16 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_ITE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m
@@ -548,12 +550,13 @@ CONFIG_TEST_BITMAP=m 
CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y