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,
Frederic Leroy <fredo@starox.org>,
"John W. Linville" <linville@tuxdriver.com>,
Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the staging tree with the wireless tree
Date: Tue, 23 Feb 2010 18:14:58 -0800 [thread overview]
Message-ID: <20100224021458.GA14159@kroah.com> (raw)
In-Reply-To: <20100222163134.367353e7.sfr@canb.auug.org.au>
On Mon, Feb 22, 2010 at 04:31:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit
> e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix
> compile error from wireless-testing commit") from the wireless tree and
> commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use %
> pM for mac address output") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> as necessary.
Looks good to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2010-02-24 3:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 5:31 linux-next: manual merge of the staging tree with the wireless tree Stephen Rothwell
2010-02-24 2:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 6:27 Stephen Rothwell
2011-03-02 14:26 ` Greg KH
2011-03-02 15:39 ` Arend van Spriel
2011-05-18 2:56 Stephen Rothwell
2011-05-18 5:09 ` Greg KH
2011-05-18 18:53 ` Sukesh Srikakula
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=20100224021458.GA14159@kroah.com \
--to=greg@kroah.com \
--cc=fredo@starox.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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.