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

Bug#267391: Does not apply against kernel-source-2.4.26 2.4.26-6



On Mon, Aug 23, 2004 at 11:10:54AM +0900, Horms wrote:
> On Sun, Aug 22, 2004 at 02:28:21PM +0200, Sven Luther wrote:
> > On Sun, Aug 22, 2004 at 01:04:23PM +0200, Jens Schmalzing wrote:
> > > 
> > > Package: kernel-patch-powerpc-2.4.26
> > > Version: 2.4.26-1
> > > Severity: important
> > > 
> > > Hi,
> > > 
> > > subject says it all.  More precisely:
> > > 
> > > $ < /usr/src/kernel-patches/powerpc/debian-powerpc.diff.gz gunzip | patch -p1 -f -s --dry-run
> > > 1 out of 2 hunks FAILED -- saving rejects to file arch/ppc/platforms/Makefile.rej
> > > Patch attempted to create file drivers/scsi/ata_piix.c, which already exists.
> > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/ata_piix.c.rej
> > 
> > This hunk we can probably remove, i doubt anyone is using powerpc processors
> > over some intel PIIX chipset, if i am doing it correctly.
> > 
> > > What's more, the build of the official kernel-image packages just
> > > rolls over these errors.  I haven't investigated what this actually
> > > means for the resulting kernels, though.
> > 
> > Well, this is probably because the debian version specific patch handling got
> > removed (by you) from the 2.4.26 kernels. In 2.4.25 we would not have had this
> > problem.
> > 
> > That said, 2.4.26 just recently escaped NEW, i will redo the patching as soon
> > as alioth is fixed. Well, i will redo it earlie, but submit once alioth is
> > fixed.

Ok, i fixed it, but since alioth is still down, or so it seems. Well it seems
improved, but an update tentative still fails.

> Hi All,
> 
> Please note that in kernel-source 2.4.26-6 I have updated SATA.
> There is a posibility that arch patches may not apply any more.
> Appologies for any inconvenience.

The sata patches of the -benh tree where backed out for 2.4.26 by benh anyway.
The piix patch i removed, as there is really no reason for intel piix chipset

As for the other problem, it seems that RTAS CONFIG option has dissapeared. I
know it has for 2.6.8, but hadn't noticed this yet in the 2.4 kernels.

Friendly,

Sven Luther



Reply to: