[Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes

[Linas Vepstas]

On Tue, Jun 12, 2007 at 08:04:18PM -0400, Jeff Garzik wrote:
> >
> >>Should I just drop all spidernet patches and start over?
> >
> >No. Apply the series I just sent you, dropping the one called
> >"patch 6/15", the one from Florin Malita, as it appears you'd
> >previously picked this up.  The rest of the patches should apply
> >cleanly; I just cheked. I just did a "git pull" of 
> >git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
> >and checked. The result of patching is exactly as it should be.
> >
> 
> As I just stated, many of the patches in the "current" patch series have 
> 
> Linas Vepstas (11):
>       s2io: add PCI error recovery support
>       s2io: add PCI error recovery support
>       spidernet: beautify error messages
>       spidernet: move a block of code around
>       spidernet: zero out a pointer.
>       spidernet: null out skb pointer after its been used.
>       spidernet: Don't terminate the RX ring
>       spidernet: enhance the dump routine
>       spidernet: reset the card when an rxramfull is seen
>       spidernet: service TX later.
>       spidernet: increase the NAPI weight
> 
> These are clearly duplicating some of the patches in your patchseries, 
> which means you are woefully out of sync with upstream.
> already been applied to netdev-2.6.git#upstream:

My apologies; I'm trying.  Seems that I've tripped over a git "feature".

"git branch" shows that I'm on "upstream".  So I performed a "git pull" 
(without any additional arguments) assuming that it would sync to your
"upstream" branch.  And so my email was based on this.

Some googling seems to show that "git pull" has a bug/feature of
ignoring the branch that one is working in, and pulling "master"
no matter what.  I have no clue why; this seems broken to me.

So ... let me try again ... 
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 upstream
...
Automatic merge failed; fix up by hand

So not only did "git pull" not fetch the correct branch, but it also
wrecked the repository.  Glug. I have no clue how to recover from this.

I suggest dropping the above series of spidernet patches, and reapplying 
the series of 15 I'd sent in. 

--linas