Re: [PATCH] block: fix residual byte count handling

[Jens Axboe]

On Tue, Mar 04 2008, Mike Galbraith wrote:
> 
> On Tue, 2008-03-04 at 14:03 +0100, Jens Axboe wrote:
> 
> > Re-read my original mail! It states that you should just pull:
> > 
> > git://git.kernel.dk/linux-2.6-block.git for-linus
> > 
> > into your linus branch, or just create a test branch off linus' master
> > and pull into that. IOW, it's the for-linus branch that you should pull,
> > nothing else.
> 
> Well, I had a good reason.  You know how to un-pull, I know how to
> un-remote to get back to pristine after I'm done testing... guaranteed
> without whimpering pathetically on the git list ;-)

OK, if you're on master, it's pretty easy:

$ git branch test-branch
$ git checkout test-branch
$ git pull git://git.kernel.dk/linux-2.6-block.git for-linus

[build, boot, test]
$ git checkout master
$ git branch -D test-branch

> Anyway, I checked out the one with the big-fat-hint in it's name
> (block-for-linus/for-linus).
> Same error.  Git this morning with patches...
> 	restore_meaning_of_data_len.diff
> 	seperate_out_padding_from_alignment.diff
> ...reverted restored me to the originally reported k3b error, nothing
> new noted.
> 
> If I tested the wrong branch, whack me upside the head, and I'll follow
> your pull destructions, and figure out how to un-pull later.

for-linus is the right branch, but I'm just a little worried that you
didn't test what you think you tested. What does cat .git/HEAD say? If
that is a ref to a file (eg refs/heads/master), what does that file
contain?

-- 
Jens Axboe

--
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/