On Wed, Jan 14, 2004 at 09:51:45PM +0100, Jan Derfinak wrote:
> On Wed, 14 Jan 2004, John Palkovic wrote:
>
> > Pentium III, debian unstable, 2.4.25-pre4 kernel tree. Updated my kernel
> > tree with 'cvs update -d', then did a
>
> It seems that that 2.6 tree is broken too. I updated my tree from sgi cvs
> and I noticed that dmapi option is missed. Since sgi cvs kernel is in
I've got that in a workarea (the debug options are missing too),
I'll check that in shortly.
> version 2.6.1, it contains files from 2.6.0 which are removed in vanila
> 2.6.1 kernel (for example arch/arm/boot/compressed/head-integrator.S). But
Oh, I musta botched the merge a bit, thanks - I'll fix that up.
> worser is that compilation ended with errors included below. After this
> knowledge I used vanila 2.6.1 and replaced content of xfs directory with
> xfs-linux from cvs. But file xfs/quota/xfs_qm_bhv.c contains
> bhv_module_init, bhv_module_exit and XFS_QMOPS which are defined only in
> linux-2.4/xfs_vfs.h. I must have removed quota to compile kernel. So
> I think that after merge is cvs in bad condition. :(
I think I saw a fix go past from Russell for that one, it
should show up in cvs before too long.
thanks.
--
Nathan
|