From f3d86925101374e524ca803df1f4f1b3bafaf90b Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 9 Jul 2018 10:19:39 +0200 Subject: [PATCH 1/4] [m68k] net: Enable CONFIG_XSURF100 as module --- debian/changelog | 4 ++++ debian/config/m68k/config | 1 + 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5b868cff7..ad909b230 100644 --- a/debian/changelog +++ b/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,9 @@ 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. + -- Ben Hutchings Thu, 12 Jul 2018 05:12:50 +0100 linux (4.18~rc3-1~exp1) experimental; urgency=medium diff --git a/debian/config/m68k/config b/debian/config/m68k/config index eca030a3c..06a35ae85 100644 --- a/debian/config/m68k/config +++ b/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 From 2a91a3d2e2dd585323408cb6c271d8c7eccccbe6 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 9 Jul 2018 10:20:02 +0200 Subject: [PATCH 2/4] [m68k] udeb: Remove individual modules from nic-modules --- debian/changelog | 2 ++ debian/installer/m68k/modules/m68k/nic-modules | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad909b230..44869db32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,9 @@ linux (4.18~rc4-1~exp1) experimental; urgency=medium * [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. -- Ben Hutchings Thu, 12 Jul 2018 05:12:50 +0100 diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/m68k/modules/m68k/nic-modules index d17bfb788..2512e8395 100644 --- a/debian/installer/m68k/modules/m68k/nic-modules +++ b/debian/installer/m68k/modules/m68k/nic-modules @@ -1,15 +1 @@ #include - -a2065 ? -apne ? -ariadne ? -ariadne2 ? -atari_ethernec ? -atarilance ? -hydra ? -mac8390 ? -mac89x0 ? -macsonic ? -ne ? -smc91x ? -zorro8390 ? From ae0e47cf78921206b3a094c4b2340859ec333c7b Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 9 Jul 2018 10:20:43 +0200 Subject: [PATCH 3/4] [m68k] scsi: Enable CONFIG_SCSI_ZORRO_ESP as module --- debian/changelog | 1 + debian/config/m68k/config | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 44869db32..02b83dd4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (4.18~rc4-1~exp1) experimental; urgency=medium * [m68k] net: Enable CONFIG_XSURF100 as module. * [m68k] udeb: Remove individual modules from nic-modules. + * [m68k] scsi: Enable CONFIG_SCSI_ZORRO_ESP as module. -- Ben Hutchings Thu, 12 Jul 2018 05:12:50 +0100 diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 06a35ae85..f0dfe9926 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -500,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 From db4ed9e563092b5847556f319fa29109bc5221a9 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 9 Jul 2018 10:21:11 +0200 Subject: [PATCH 4/4] [m68k] udeb: Add zorro_esp module to scsi-modules --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/scsi-modules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 02b83dd4c..1fb93bde8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux (4.18~rc4-1~exp1) experimental; urgency=medium * [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 Thu, 12 Jul 2018 05:12:50 +0100 diff --git a/debian/installer/m68k/modules/m68k/scsi-modules b/debian/installer/m68k/modules/m68k/scsi-modules index 8717c1907..f2956ef95 100644 --- a/debian/installer/m68k/modules/m68k/scsi-modules +++ b/debian/installer/m68k/modules/m68k/scsi-modules @@ -10,3 +10,4 @@ mac_esp mac_scsi mvme16x_scsi zorro7xx +zorro_esp