Re: [BK PATCHES] ide-2.6 update

[Randy.Dunlap]

Gene Heskett wrote:
> On Wednesday 27 October 2004 12:22, Bartlomiej Zolnierkiewicz wrote:
>
> > On Wed, 27 Oct 2004 12:15:55 -0400, Gene Heskett
> >
> > <gene.heskett@xxxxxxxxxxx> wrote:
> >
> > > On Wednesday 27 October 2004 09:07, Bartlomiej Zolnierkiewicz 
>
> wrote:
>
> > > > Please do a
> > > >
> > > > bk pull bk://bart.bkbits.net/ide-2.6
> > > >
> > > > This will update the following files:
> > > >
> > > > drivers/ide/ide-disk.c         |    1 +
> > > > drivers/ide/ide-dma.c          |   32
> > >
> > > Even after fixing the 4 wrapped lines in the patch, I'm not going
> > > in cleanly here:
> > >
> > > patching file drivers/ide/ide-dma.c
> > > Hunk #1 FAILED at 681.
> > > 1 out of 1 hunk FAILED -- saving rejects to file
> > > drivers/ide/ide-dma.c.rej
> > >
> > > The first 'grep' line of the patch is found at an offset of about
> > > +180 lines in the original file.
> > >
> > > The rest of it seems to have found a home, but at offsets in
> > > excess of 159 lines for a few of them.
> > >
> > > This was against a 2.6.9 tree, and 2.6.9-mm1 failed in similar
> > > fashion.  What src tree is this to be applied to?
> >
> > current linus' -bk tree, latest -bk snapshot should also be OK
>
>
> Drat.  I can't afford bitkeeper, either the time or the resources.
> So I assume this will be in 2.6.10-rc2 or 3?

Gene,

BK isn't required.  Just get the daily snapshot from
http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/
and apply it to 2.6.10-rc1 (or whatever is latest).

--
~Randy
MOTD:  Always include version info.
(Again.  Sometimes I think ln -s /usr/src/linux/.config .signature)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/