From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dominik Brodowski <linux@dominikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging-next tree with the pcmcia tree
Date: Wed, 12 May 2010 12:50:05 -0700 [thread overview]
Message-ID: <20100512195005.GD31534@kroah.com> (raw)
In-Reply-To: <20100512160352.daa747f8.sfr@canb.auug.org.au>
On Wed, May 12, 2010 at 04:03:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit ("") from the
> staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Heh, I just hacked that driver up to build properly, odds are it doesn't
run :)
But your fix looks fine, thanks for it.
greg k-h
next prev parent reply other threads:[~2010-05-12 19:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 6:03 linux-next: manual merge of the staging-next tree with the pcmcia tree Stephen Rothwell
2010-05-12 19:50 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-02 3:57 Stephen Rothwell
2010-08-02 22:23 ` Greg KH
2010-08-02 3:57 Stephen Rothwell
2010-08-02 22:23 ` Greg KH
2010-05-17 5:49 Stephen Rothwell
2010-05-17 18:01 ` Greg KH
2010-04-28 6:11 Stephen Rothwell
2010-04-28 15:25 ` Greg KH
2010-04-28 6:07 Stephen Rothwell
2010-04-28 15:26 ` 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=20100512195005.GD31534@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=sfr@canb.auug.org.au \
/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