lkml.org 
[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/6] Staging: w35und: Merge wbhal_f.h to wbhal_s.h
FromPekka Enberg <>
DateWed, 05 Jan 2011 08:11:02 +0200
On Sun, 2011-01-02 at 10:02 +0100, Pavel Machek wrote:
> Hi!
>
> >> This patch doesn't apply at all, what was it made against?
> >
> > They're actually patches that predate the ones you merged recently from
> > me. I just pulled your tree to mine and did "git format-patch" without
> > thinking about it too much.
> >
> >> Care to refresh this whole series so it can be applied?
> >
> > Sure, I can do that.
>
> Thanks... and ACK for the whole series.

Interesting enough, Greg had already merged them before I resent them:

http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-2.6.git;a=commitdiff;h=72ca8819f7f4ac4ddf82ab72ee614075821a3d00

I guess either me or Git was confused to think they hadn't been merged.
It also explains why the patches didn't apply. ;-)



\
 
 \ /
  Last update: 2011-01-05 07:13    [from the cache]
©2003-2010