xfs
[Top] [All Lists]

2.4.6 patch does not apply cleanly to 2.4.6

To: linux-xfs@xxxxxxxxxxx
Subject: 2.4.6 patch does not apply cleanly to 2.4.6
From: "Peter T. Breuer" <ptb@xxxxxxxxxx>
Date: Tue, 10 Jul 2001 16:21:13 +0200 (CEST)
Reply-to: ptb@xxxxxxxxxx
Sender: owner-linux-xfs@xxxxxxxxxxx
The 2.4.6 patch didn't apply cleanly to a pure kernel source ..

  ./fs/buffer.c.rej
  ./fs/namei.c.rej
  ./mm/vmscan.c.rej

And in any case the patch I got hold of

   linux-2.4.6-xfs-cvs-06212001.patch

contains all kinds of cvs and acl cmd extranea. Is there a clean kernel
patch hanging around somewhere?

The .rej's themselves are easy to mend, except for buffer.c, in which I
can't find a likely referant for the failed block. And in any case 
compilation of the result fails in aic7xxx!

  make[4]: Entering directory
`/usr/local/src/linux-2.4.6-xfs/drivers/scsi/aic7xxx'
echo "Warning, generated aic7xxx firmware files may be out of date!\n"
Warning, generated aic7xxx firmware files may be out of date!\n
echo "Warning, generated aic7xxx firmware files may be out of date!\n"
Warning, generated aic7xxx firmware files may be out of date!\n
gcc -D__KERNEL__ -I/usr/local/src/linux-2.4.6-xfs/include  -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
-fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=i686
-c -o aic7xxx_linux.o aic7xxx_linux.c
In file included from aic7xxx_osm.h:343,
                 from aic7xxx_linux.c:133:
aic7xxx.h:40: aic7xxx_reg.h: No such file or directory
              ^^^^^^^^^^^^^^^
In file included from aic7xxx_linux.c:133:
aic7xxx_osm.h: In function hc_flush_device_writes':
aic7xxx_osm.h:901: `INTSTAT' undeclared (first use in this function)
aic7xxx_osm.h:901: (Each undeclared identifier is reported only once
aic7xxx_osm.h:901: for each function it appears in.)


So I would guess random other patches have been applied. Fair 'nuff.
Just give me a clue what they are! Moving the 2.4.5 aic7xxx_reg.h
across almost does the trick, but not quite. aic7xxx_seq.h is also
needed. That seems to fix it. But what happened?


Peter


<Prev in Thread] Current Thread [Next in Thread>