From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dominik Brodowski <linux@dominikbrodowski.net>,
Vadim Mutilin <mutilin@ispras.ru>
Subject: Re: linux-next: manual merge of the staging tree with the pcmcia tree
Date: Sat, 21 Nov 2009 12:34:25 +1100 [thread overview]
Message-ID: <20091121123425.4c34be52.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20091120182903.GB4804@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi Greg,
On Fri, 20 Nov 2009 10:29:03 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Nov 09, 2009 at 06:15:44PM +1100, Stephen Rothwell wrote:
> >
> > I fixed it up (using the pcmcia tree version when there is a clash) and
> > can carry the fix as necessary.
> >
> > [Greg, that staging tree commit has no SOB from its author ...]
>
> Good catch, I missed that :(
>
> I've now dropped this patch from my tree, so it should be fine now.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-11-21 1:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
2009-11-21 1:34 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:27 ` Greg KH
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=20091121123425.4c34be52.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=mutilin@ispras.ru \
/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
all inboxes | Powered by JetHome®