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

Commit 2945e9f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Provide __phys_to_pfn() and __pfn_to_phys()
  m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
  m68k/defconfig: Update defconfigs for v4.4-rc1
  m68k/mac: Kill psc_present
parents c5c80bd9 eb37bc3f

arch/m68k/atari/config.c

+2 −2
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static struct platform_device *atari_netusbee_devices[] __initdata = { 
};

#endif /* CONFIG_ATARI_ETHERNEC */



#ifdef CONFIG_ATARI_SCSI

#if IS_ENABLED(CONFIG_ATARI_SCSI)

static const struct resource atari_scsi_st_rsrc[] __initconst = {

	{

		.flags = IORESOURCE_IRQ,
@@ -910,7 +910,7 @@ int __init atari_platform_init(void) 
	}

#endif



#ifdef CONFIG_ATARI_SCSI

#if IS_ENABLED(CONFIG_ATARI_SCSI)

	if (ATARIHW_PRESENT(ST_SCSI))

		platform_device_register_simple("atari_scsi", -1,

			atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));

arch/m68k/configs/amiga_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -532,11 +533,13 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -559,6 +562,7 @@ CONFIG_CRYPTO_CTS=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/apollo_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -372,6 +373,7 @@ CONFIG_INPUT_EVDEV=m 
# CONFIG_MOUSE_PS2 is not set

CONFIG_MOUSE_SERIAL=m

CONFIG_SERIO=m

CONFIG_USERIO=m

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

# CONFIG_HW_RANDOM is not set
@@ -490,11 +492,13 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -517,6 +521,7 @@ CONFIG_CRYPTO_CTS=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/atari_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -512,11 +513,13 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -539,6 +542,7 @@ CONFIG_CRYPTO_CTS=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

arch/m68k/configs/bvme6000_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ CONFIG_MPLS=y 
CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m 
CONFIG_NLS_MAC_ROMANIAN=m

CONFIG_NLS_MAC_TURKISH=m

CONFIG_DLM=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m