Merge branch 'm68k' into 'master'

Enable new m68k drivers from 4.18

See merge request kernel-team/linux!43

debian/changelog

@@ -2,6 +2,7 @@ linux (4.18~rc4-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
   * Remove remaining Python 2 (build-)dependencies:
     - Build docs using Python 3 version of Sphinx
     - linux-perf: Build docs using asciidoctor
@@ -10,6 +11,13 @@ linux (4.18~rc4-1~exp1) experimental; urgency=medium
   * udeb: Move of_mdio to nic-shared-modules (Closes: #903587)
   * [armhf] mm: Export __sync_icache_dcache() for xen-privcmd (fixes FTBFS)
 
+  [ John Paul Adrian Glaubitz ]
+
+  * [m68k] net: Enable CONFIG_XSURF100 as module.
+  * [m68k] udeb: Remove individual modules from nic-modules.
+  * [m68k] scsi: Enable CONFIG_SCSI_ZORRO_ESP as module.
+  * [m68k] udeb: Add zorro_esp module to scsi-modules.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 12 Jul 2018 05:12:50 +0100
 
 linux (4.18~rc3-1~exp1) experimental; urgency=medium

debian/config/m68k/config

@@ -381,6 +381,7 @@ CONFIG_MAC8390=m
 CONFIG_NE2000=m
 CONFIG_APNE=m
 CONFIG_ZORRO8390=m
+CONFIG_XSURF100=m
 
 ##
 ## file: drivers/net/ethernet/amd/Kconfig
@@ -499,6 +500,7 @@ CONFIG_A2091_SCSI=m
 CONFIG_GVP11_SCSI=m
 CONFIG_SCSI_A4000T=m
 CONFIG_SCSI_ZORRO7XX=m
+CONFIG_SCSI_ZORRO_ESP=m
 CONFIG_ATARI_SCSI=m
 CONFIG_MAC_SCSI=m
 CONFIG_SCSI_MAC_ESP=m

debian/installer/m68k/modules/m68k/nic-modules

@@ -1,15 +1 @@
 #include <nic-modules>
-
-a2065 ?
-apne ?
-ariadne ?
-ariadne2 ?
-atari_ethernec ?
-atarilance ?
-hydra ?
-mac8390 ?
-mac89x0 ?
-macsonic ?
-ne ?
-smc91x ?
-zorro8390 ?

debian/installer/m68k/modules/m68k/scsi-modules

@@ -10,3 +10,4 @@ mac_esp
 mac_scsi
 mvme16x_scsi
 zorro7xx
+zorro_esp