[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [d-i] Testing daily image of d-i



> > I've prepared a patch that should apply cleanly on top of 2.6.18-5 (the
> > current Debian kernel source for m68k).
>
> There are some strange things to your patch...
>
> --- ../linux-2.6-2.6.18-debian/debian/build/build-m68k-none-amiga/arch/m68k/configs/amiga_defconfig     2006-09-20 05:42:06.000000000 +0200
> +++ arch/m68k/configs/amiga_defconfig   2006-12-05 16:41:35.000000000 +0100
> @@ -249,7 +249,9 @@
>  CONFIG_BLZ2060_SCSI=y
>  CONFIG_BLZ1230_SCSI=y
>  CONFIG_FASTLANE_SCSI=y
> +CONFIG_SCSI_AMIGA7XX=y
>  CONFIG_OKTAGON_SCSI=y
> +CONFIG_SCSI_NCR53C7xx_FAST=y
>
> Strange, the CONFIG_SCSI_NCR53C7xx_FAST symbol gets added to
> amiga_defconfig, bvme6000_defconfig and mvme16x_defconfig but it got
> removed here:
>
> --- ../linux-2.6-2.6.18-debian/debian/build/build-m68k-none-amiga/drivers/scsi/Kconfig  2006-11-24 16:11:09.000000000 +0100
> +++ drivers/scsi/Kconfig        2006-12-05 16:41:35.000000000 +0100
> @@ -1801,17 +1793,9 @@
>           SCSI controller chip.  Almost everyone using one of these boards
>           will want to say Y to this question.
>
> -config SCSI_NCR53C7xx_FAST
> -       bool "allow FAST-SCSI [10MHz]"
> -       depends on SCSI_AMIGA7XX || MVME16x_SCSI || BVME6000_SCSI
> -       help
> -         This will enable 10MHz FAST-SCSI transfers with your host
> -         adapter. Some systems have problems with that speed, so it's safest
> -         to say N here.
> -
>  config SUN3_SCSI
>         tristate "Sun3 NCR5380 SCSI"
>         depends on SUN3 && SCSI
>         select SCSI_SPI_ATTRS
>         help
>           This option will enable support for the OBIO (onboard io) NCR5380
>

Yep, I wondered about that as well, but I left this piece in. I'll have
to check Geert's original patch again (this was the result of patching
vanilla 2.6.18, then diffing against Debian 2.6.18-5, and I've had to
remove other crud from overlapping patches so this might be some of it)

> Plus, your patch re-adds some headers which are no longer needed:
> drivers/scsi/amiga7xx.h, drivers/scsi/bvme6000.h and
> drivers/scsi/mvme16x.h (apparently already removed in
> 2.6-2.6.18-debian).

Should be removed; that's due to a messup on part of my patch binary (or
Debian's vanilla 2.6.18 had them removed already).

I'll update the patch - does anyone feel like trying it, or am I just
wasting precious electrons here?

	Michael



Reply to: