DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:references;
        b=lf79FIFgpXK4iJJpcPBVzkwoQoZzOSwSr/2TmVjXfWF5ffxs3c0nJNnyHFBQIpBrkwpzG1EL7SMgjZcxoROib8/r7Sjv7ZeFLUvyeE0bcCoJY625LbDy0f1ZN61TMLszFlCyQgwomAo4mCQ9PYjReyu+RC2rMLGUfaHSfDBiyYE=
Message-ID: <58cb370e041027101527b5e340@mail.gmail.com>
Date: Wed, 27 Oct 2004 19:15:49 +0200
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Reply-To: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: gene.heskett@verizon.net
Subject: Re: [BK PATCHES] ide-2.6 update
Cc: linux-kernel@vger.kernel.org, torvalds@osdl.org, linux-ide@vger.kernel.org
In-Reply-To: <200410271305.06265.gene.heskett@verizon.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
References: <58cb370e04102706074c20d6d7@mail.gmail.com>
	 <200410271215.55472.gene.heskett@verizon.net>
	 <58cb370e04102709221d6a9103@mail.gmail.com>
	 <200410271305.06265.gene.heskett@verizon.net>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1642
Lines: 47

On Wed, 27 Oct 2004 13:05:06 -0400, Gene Heskett
<gene.heskett@verizon.net> wrote:
> On Wednesday 27 October 2004 12:22, Bartlomiej Zolnierkiewicz wrote:
> 
> 
> >On Wed, 27 Oct 2004 12:15:55 -0400, Gene Heskett
> >
> ><gene.heskett@verizon.net> 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?

I hope it will be in the next -bk snapshot...
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/