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,
Henk de Groot <henk.de.groot@hetnet.nl>,
Dominik Brodowski <linux@dominikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging-next tree with the pcmcia tree
Date: Mon, 17 May 2010 11:01:30 -0700 [thread overview]
Message-ID: <20100517180130.GC16419@kroah.com> (raw)
In-Reply-To: <20100517154919.535f12a1.sfr@canb.auug.org.au>
On Mon, May 17, 2010 at 03:49:19PM +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
> eb14120f743d29744d9475bffec56ff4ad43a749 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 93822ad193f1b1d92422dc3d539456acbe1a85ef ("Staging: wlags49_hs2: Fix
> wlags49_hs2 driver after build fixes broke it") from the staging-next
> tree.
>
> I fixed it up (see below - basically the staging-next version) and can
> carry the fix as necessary.
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2010-05-17 18:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 5:49 linux-next: manual merge of the staging-next tree with the pcmcia tree Stephen Rothwell
2010-05-17 18:01 ` 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-12 6:03 Stephen Rothwell
2010-05-12 19:50 ` 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=20100517180130.GC16419@kroah.com \
--to=greg@kroah.com \
--cc=henk.de.groot@hetnet.nl \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.