From: Pekka Enberg <penberg@kernel.org>
To: Pavel Machek <pavel@ucw.cz>
Cc: Greg KH <greg@kroah.com>, gregkh@suse.de, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/6] Staging: w35und: Merge wbhal_f.h to wbhal_s.h
Date: Wed, 05 Jan 2011 08:11:02 +0200 [thread overview]
Message-ID: <1294207862.5248.37.camel@jaguar> (raw)
In-Reply-To: <20110102090231.GF32469@atrey.karlin.mff.cuni.cz>
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. ;-)
prev parent reply other threads:[~2011-01-05 6:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-04 9:16 [PATCH 1/6] " Pekka Enberg
2010-12-04 9:16 ` [PATCH 2/6] w35und: Rename wbhal_s.h to wbhal.h Pekka Enberg
2010-12-04 9:16 ` [PATCH 3/6] w35und: Kill empty Mds_Destroy function Pekka Enberg
2010-12-04 9:16 ` [PATCH 4/6] w35und: Kill struct hwdata ->NullPacketCount Pekka Enberg
2010-12-04 9:16 ` [PATCH 5/6] w35und: Kill struct hwdata ->HwStop Pekka Enberg
2010-12-04 9:16 ` [PATCH 6/6] w35und: Kill struct hwdata ->SurpriseRemoveCount Pekka Enberg
2010-12-07 0:12 ` [PATCH 1/6] Staging: w35und: Merge wbhal_f.h to wbhal_s.h Greg KH
2010-12-07 6:31 ` Pekka Enberg
2011-01-02 9:02 ` Pavel Machek
2011-01-05 6:11 ` Pekka Enberg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294207862.5248.37.camel@jaguar \
--to=penberg@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome