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,
Johannes Berg <johannes.berg@intel.com>,
"John W. Linville" <linville@tuxdriver.com>,
Arend van Spriel <arend@broadcom.com>,
Roland Vossen <rvossen@broadcom.com>
Subject: Re: linux-next: manual merge of the staging tree with the wireless tree
Date: Wed, 2 Mar 2011 09:26:26 -0500 [thread overview]
Message-ID: <20110302142626.GC2889@kroah.com> (raw)
In-Reply-To: <20110302172754.412dca34.sfr@canb.auug.org.au>
On Wed, Mar 02, 2011 at 05:27:54PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmsmac/wl_mac80211.c between commit
> 7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation
> return void") from the wireless tree (where this file is called
> drivers/staging/brcm80211/sys/wl_mac80211.c) and commits
> 62b54dca17ef40116491b0ca27ca35fbe9daedc6 ("staging: brcm80211: cleanup
> function prototypes in header files") and
> 55182a10063c40eda4dc5afecff712e5c3617ffc ("staging: brcm80211: cosmetic
> changes") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, that looks good to me.
greg k-h
next prev parent reply other threads:[~2011-03-02 14:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-02 6:27 linux-next: manual merge of the staging tree with the wireless tree Stephen Rothwell
2011-03-02 14:26 ` Greg KH [this message]
2011-03-02 15:39 ` Arend van Spriel
-- strict thread matches above, loose matches on Subject: below --
2011-05-18 2:56 Stephen Rothwell
2011-05-18 5:09 ` Greg KH
2011-05-18 18:53 ` Sukesh Srikakula
2010-02-22 5:31 Stephen Rothwell
2010-02-24 2:14 ` 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=20110302142626.GC2889@kroah.com \
--to=greg@kroah.com \
--cc=arend@broadcom.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rvossen@broadcom.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).